repack: retain the return value of pack-objects

During the review process of the previous commit (repack: rewrite the
shell script in C), Johannes Sixt proposed to retain any exit codes from
the sub-process, which makes it probably more obvious in case of failure.

As the commit before should behave as close to the original shell
script, the proposed change is put in this extra commit.
The infrastructure however was already setup in the previous commit.
(Having a local 'ret' variable)

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2013-09-15 17:33:21 +02:00 committed by Junio C Hamano
parent a1bbc6c017
commit ffc9329f48

View File

@ -231,7 +231,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
ret = start_command(&cmd); ret = start_command(&cmd);
if (ret) if (ret)
return 1; return ret;
nr_packs = 0; nr_packs = 0;
out = xfdopen(cmd.out, "r"); out = xfdopen(cmd.out, "r");
@ -244,7 +244,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
fclose(out); fclose(out);
ret = finish_command(&cmd); ret = finish_command(&cmd);
if (ret) if (ret)
return 1; return ret;
argv_array_clear(&cmd_args); argv_array_clear(&cmd_args);
if (!nr_packs && !quiet) if (!nr_packs && !quiet)