summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-05 14:54:13 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-05 14:54:13 -0800
commitb11a3badf2353d69a244348991ff35f823f6b967 (patch)
treec04d274e69d878fe10231f4409984f51e8d775ca
parent15f409643e5d40f441227c6cd75e9803a8b6b871 (diff)
parent8c24f5b022095f4735fcb73364ccae7d97576636 (diff)
downloadgit-b11a3badf2353d69a244348991ff35f823f6b967.tar.gz
Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maint
"git rebase", unlike all other callers of "gc --auto", did not ignore the exit code from "gc --auto". * jk/ok-to-fail-gc-auto-in-rebase: rebase: ignore failures from "gc --auto"
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index af7ba5fd90..cf60c43908 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -176,7 +176,7 @@ You can run "git stash pop" or "git stash drop" at any time.
finish_rebase () {
apply_autostash &&
- git gc --auto &&
+ { git gc --auto || true; } &&
rm -rf "$state_dir"
}