From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 25 Sep 2013 06:27:02 +0000 (-0700)
Subject: Merge branch 'nd/fetch-pack-error-reporting-fix'
X-Git-Tag: v1.8.5-rc0~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40b77322d2bffc7d513d1540ae127a08e84aadcb;p=thirdparty%2Fgit.git

Merge branch 'nd/fetch-pack-error-reporting-fix'

* nd/fetch-pack-error-reporting-fix:
  fetch-pack.c: show correct command name that fails
---

40b77322d2bffc7d513d1540ae127a08e84aadcb
diff --cc fetch-pack.c
index 13b5b43bfa,5546a8ca67..a0e0350ae6
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@@ -659,10 -688,9 +659,10 @@@ static int get_pack(struct fetch_pack_a
  	const char *argv[22];
  	char keep_arg[256];
  	char hdr_arg[256];
- 	const char **av;
+ 	const char **av, *cmd_name;
  	int do_keep = args->keep_pack;
  	struct child_process cmd;
 +	int ret;
  
  	memset(&demux, 0, sizeof(demux));
  	if (use_sideband) {
@@@ -719,14 -747,11 +719,14 @@@
  				strcpy(keep_arg + s, "localhost");
  			*av++ = keep_arg;
  		}
 +		if (args->check_self_contained_and_connected)
 +			*av++ = "--check-self-contained-and-connected";
  	}
  	else {
- 		*av++ = "unpack-objects";
+ 		*av++ = cmd_name = "unpack-objects";
  		if (args->quiet || args->no_progress)
  			*av++ = "-q";
 +		args->check_self_contained_and_connected = 0;
  	}
  	if (*hdr_arg)
  		*av++ = hdr_arg;
@@@ -747,13 -772,8 +747,13 @@@
  		close(cmd.out);
  	}
  
 -	if (finish_command(&cmd))
 +	ret = finish_command(&cmd);
 +	if (!ret || (args->check_self_contained_and_connected && ret == 1))
 +		args->self_contained_and_connected =
 +			args->check_self_contained_and_connected &&
 +			ret == 0;
 +	else
- 		die("%s failed", argv[0]);
+ 		die("%s failed", cmd_name);
  	if (use_sideband && finish_async(&demux))
  		die("error in sideband demultiplexer");
  	return 0;