From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Jul 2014 19:53:04 +0000 (-0700)
Subject: Merge branch 'bc/fix-rebase-merge-skip'
X-Git-Tag: v2.1.0-rc0~69
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6293aea559b6c8f224f748e5a2a641ddb6cca55a?ds=inline;hp=-c

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

"git rebase --skip" did not work well when it stopped due to a
conflict twice in a row.

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

6293aea559b6c8f224f748e5a2a641ddb6cca55a
diff --combined git-rebase--merge.sh
index 6d77b3ca91,f6b5dd03d7..d3fb67d75b
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@@ -24,10 -24,10 +24,10 @@@ continue_merge () 
  		die "$resolvemsg"
  	fi
  
 -	cmt=`cat "$state_dir/current"`
 +	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
@@@ -143,7 -144,7 +144,7 @@@ echo "$onto_name" > "$state_dir/onto_na
  write_basic_state
  
  msgnum=0
 -for cmt in `git rev-list --reverse --no-merges "$revisions"`
 +for cmt in $(git rev-list --reverse --no-merges "$revisions")
  do
  	msgnum=$(($msgnum + 1))
  	echo "$cmt" > "$state_dir/cmt.$msgnum"