From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jul 2014 18:16:16 +0000 (-0700)
Subject: Merge branch 'bc/fix-rebase-merge-skip' into maint
X-Git-Tag: v2.0.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/64630d807ae0a9717ae39c87bd1458bf15c62142?ds=sidebyside;hp=-c

Merge branch 'bc/fix-rebase-merge-skip' into maint

During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.

* bc/fix-rebase-merge-skip:
rebase--merge: fix --skip with two conflicts in a row
---

64630d807ae0a9717ae39c87bd1458bf15c62142
diff --combined git-rebase--merge.sh
index 71429fd743,f6b5dd03d7..66c64d7ef2
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@@ -27,7 -27,7 +27,7 @@@ continue_merge () 
  	cmt=`cat "$state_dir/current"`
  	if ! git diff-index --quiet --ignore-submodules HEAD --
  	then
 -		if ! git commit --no-verify -C "$cmt"
 +		if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt"
  		then
  			echo "Commit failed, please do not call \"git commit\""
  			echo "directly, but instead do one of the following: "
@@@ -53,11 -53,12 +53,12 @@@
  }
  
  call_merge () {
- 	cmt="$(cat "$state_dir/cmt.$1")"
+ 	msgnum="$1"
+ 	echo "$msgnum" >"$state_dir/msgnum"
+ 	cmt="$(cat "$state_dir/cmt.$msgnum")"
  	echo "$cmt" > "$state_dir/current"
  	hd=$(git rev-parse --verify HEAD)
  	cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
- 	msgnum=$(cat "$state_dir/msgnum")
  	eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
  	eval GITHEAD_$hd='$onto_name'
  	export GITHEAD_$cmt GITHEAD_$hd