diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:27:02 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:27:02 -0700 |
| commit | 40b77322d2bffc7d513d1540ae127a08e84aadcb (patch) | |
| tree | 1c85776d4eaf11a7abe3d727c466bed048192791 | |
| parent | eb34959e107b0761053662a1498026f856f2ce44 (diff) | |
| parent | 4727f671b834a565343ed1af613654ba4d6ececc (diff) | |
| download | git-40b77322d2bffc7d513d1540ae127a08e84aadcb.tar.gz | |
Merge branch 'nd/fetch-pack-error-reporting-fix'
* nd/fetch-pack-error-reporting-fix:
fetch-pack.c: show correct command name that fails
| -rw-r--r-- | fetch-pack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 13b5b43bfa..a0e0350ae6 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -659,7 +659,7 @@ static int get_pack(struct fetch_pack_args *args, 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; @@ -706,7 +706,7 @@ static int get_pack(struct fetch_pack_args *args, if (do_keep) { if (pack_lockfile) cmd.out = -1; - *av++ = "index-pack"; + *av++ = cmd_name = "index-pack"; *av++ = "--stdin"; if (!args->quiet && !args->no_progress) *av++ = "-v"; @@ -723,7 +723,7 @@ static int get_pack(struct fetch_pack_args *args, *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; @@ -741,7 +741,7 @@ static int get_pack(struct fetch_pack_args *args, cmd.in = demux.out; cmd.git_cmd = 1; if (start_command(&cmd)) - die("fetch-pack: unable to fork off %s", argv[0]); + die("fetch-pack: unable to fork off %s", cmd_name); if (do_keep && pack_lockfile) { *pack_lockfile = index_pack_lockfile(cmd.out); close(cmd.out); @@ -753,7 +753,7 @@ static int get_pack(struct fetch_pack_args *args, 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; |