diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-01-26 15:40:29 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-01-26 15:40:29 -0800 |
commit | eefc461ce3f2f0405639ff0919b844a894d6a02c (patch) | |
tree | d1098dcfbf39809b605ef1101928b0c800fbbfaa | |
parent | Merge branch 'js/pull-rebase-i' (diff) | |
parent | rebase: ignore failures from "gc --auto" (diff) | |
download | tgif-eefc461ce3f2f0405639ff0919b844a894d6a02c.tar.xz |
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"
-rwxr-xr-x | git-rebase.sh | 2 |
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" } |