From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Sep 2013 19:34:36 +0000 (-0700)
Subject: Merge branch 'mm/rebase-continue-freebsd-WB'
X-Git-Tag: v1.8.5-rc0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f26f250b442b57d0e6d9295bb98690ce70640759;p=thirdparty%2Fgit.git

Merge branch 'mm/rebase-continue-freebsd-WB'

Work around a bug in FreeBSD shell that caused a regression to "git
rebase" in v1.8.4.  May need to be later applied to 'maint'.

* mm/rebase-continue-freebsd-WB:
  rebase: fix run_specific_rebase's use of "return" on FreeBSD
---

f26f250b442b57d0e6d9295bb98690ce70640759
diff --cc git-rebase.sh
index 8d7659a22c,7ab6434a4f..226752fbff
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -147,27 -143,7 +147,27 @@@ move_to_original_branch () 
  	esac
  }
  
 +finish_rebase () {
 +	if test -f "$state_dir/autostash"
 +	then
 +		stash_sha1=$(cat "$state_dir/autostash")
 +		if git stash apply $stash_sha1 2>&1 >/dev/null
 +		then
 +			echo "$(gettext 'Applied autostash.')"
 +		else
 +			git stash store -m "autostash" -q $stash_sha1 ||
 +			die "$(eval_gettext "Cannot store \$stash_sha1")"
 +			gettext 'Applying autostash resulted in conflicts.
 +Your changes are safe in the stash.
 +You can run "git stash pop" or "git stash drop" at any time.
 +'
 +		fi
 +	fi
 +	git gc --auto &&
 +	rm -rf "$state_dir"
 +}
 +
- run_specific_rebase () {
+ run_specific_rebase_internal () {
  	if [ "$interactive_rebase" = implied ]; then
  		GIT_EDITOR=:
  		export GIT_EDITOR