summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-26 23:40:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-26 23:40:29 (GMT)
commiteefc461ce3f2f0405639ff0919b844a894d6a02c (patch)
treed1098dcfbf39809b605ef1101928b0c800fbbfaa /git-rebase.sh
parentf9219c0b3233229c6686224dfc953e5b3fe92a84 (diff)
parent8c24f5b022095f4735fcb73364ccae7d97576636 (diff)
downloadgit-eefc461ce3f2f0405639ff0919b844a894d6a02c.zip
git-eefc461ce3f2f0405639ff0919b844a894d6a02c.tar.gz
git-eefc461ce3f2f0405639ff0919b844a894d6a02c.tar.bz2
Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'
"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"
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index af7ba5f..cf60c43 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"
}