summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-01-13 13:47:18 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-01-13 12:04:53 -0800
commit8c24f5b022095f4735fcb73364ccae7d97576636 (patch)
tree09cd5d291ff1284d5dc9198b2e03a0b42b662118 /contrib
parentGit 2.5.4 (diff)
downloadtgif-8c24f5b022095f4735fcb73364ccae7d97576636.tar.xz
rebase: ignore failures from "gc --auto"
After rebasing, we call "gc --auto" to clean up if we created a lot of loose objects. However, we do so inside an &&-chain. If "gc --auto" fails (e.g., because a previous background gc blocked us by leaving "gc.log" in place), then: 1. We will fail to clean up the state directory, leaving the user stuck in the rebase forever (even "git am --abort" doesn't work, because it calls "gc --auto"!). 2. In some cases, we may return a bogus exit code from rebase, indicating failure when everything except the auto-gc succeeded. We can fix this by ignoring the exit code of "gc --auto". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions