From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Feb 2016 22:54:13 +0000 (-0800)
Subject: Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maint
X-Git-Tag: v2.7.1~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b11a3badf2353d69a244348991ff35f823f6b967?hp=-c

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"
---

b11a3badf2353d69a244348991ff35f823f6b967
diff --combined git-rebase.sh
index af7ba5fd90,e8b6144aae..cf60c43908
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -14,7 -14,7 +14,7 @@@ git-rebase --continue | --abort | --ski
   Available options are
  v,verbose!         display a diffstat of what changed upstream
  q,quiet!           be quiet. implies --no-stat
 -autostash!         automatically stash/stash pop before and after
 +autostash          automatically stash/stash pop before and after
  fork-point         use 'merge-base --fork-point' to refine upstream
  onto=!             rebase onto given branch instead of upstream
  p,preserve-merges! try to recreate merges instead of ignoring them
@@@ -176,7 -176,7 +176,7 @@@ You can run "git stash pop" or "git sta
  
  finish_rebase () {
  	apply_autostash &&
- 	git gc --auto &&
+ 	{ git gc --auto || true; } &&
  	rm -rf "$state_dir"
  }
  
@@@ -292,9 -292,6 +292,9 @@@ d
  	--autostash)
  		autostash=true
  		;;
 +	--no-autostash)
 +		autostash=false
 +		;;
  	--verbose)
  		verbose=t
  		diffstat=t