summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2019-06-12 13:29:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-12 18:20:53 (GMT)
commite103f7276f0d809c2935ebc1a3d68c6bbfaed23d (patch)
tree8d28ceab6dcdd7ff7e7400a15ffa54cf649a2565 /builtin/gc.c
parentc7944050af45c7384f97c712cb4d126672c7cfa6 (diff)
downloadgit-e103f7276f0d809c2935ebc1a3d68c6bbfaed23d.zip
git-e103f7276f0d809c2935ebc1a3d68c6bbfaed23d.tar.gz
git-e103f7276f0d809c2935ebc1a3d68c6bbfaed23d.tar.bz2
commit-graph: return with errors during write
The write_commit_graph() method uses die() to report failure and exit when confronted with an unexpected condition. This use of die() in a library function is incorrect and is now replaced by error() statements and an int return type. Return zero on success and a negative value on failure. Now that we use 'goto cleanup' to jump to the terminal condition on an error, we have new paths that could lead to uninitialized values. New initializers are added to correct for this. The builtins 'commit-graph', 'gc', and 'commit' call these methods, so update them to check the return value. Test that 'git commit-graph write' returns a proper error code when hitting a failure condition in write_commit_graph(). Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 020f725..3984add 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -664,9 +664,10 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
clean_pack_garbage();
}
- if (gc_write_commit_graph)
- write_commit_graph_reachable(get_object_directory(), 0,
- !quiet && !daemonized);
+ if (gc_write_commit_graph &&
+ write_commit_graph_reachable(get_object_directory(), 0,
+ !quiet && !daemonized))
+ return 1;
if (auto_gc && too_many_loose_objects())
warning(_("There are too many unreachable loose objects; "