summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-02 12:53:04 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-02 12:53:04 -0700
commit6293aea559b6c8f224f748e5a2a641ddb6cca55a (patch)
tree0d67ca045e0ffb1d92a1a11e3e7aa4b7e58cc6b3 /git-rebase--merge.sh
parent8061ae8b4618d69a67ff6cfb687d7044964d4b04 (diff)
parent95104c7e257652b82aed089494def344e3938928 (diff)
downloadgit-6293aea559b6c8f224f748e5a2a641ddb6cca55a.tar.gz
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
Diffstat (limited to 'git-rebase--merge.sh')
-rw-r--r--git-rebase--merge.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 6d77b3ca91..d3fb67d75b 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -53,11 +53,12 @@ continue_merge () {
}
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