diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:16:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:16:16 -0700 |
| commit | 64630d807ae0a9717ae39c87bd1458bf15c62142 (patch) | |
| tree | ab4955b7e70e14600028aa4f7fd0d99f5579452a /git-rebase--merge.sh | |
| parent | 9092a9696bee9a5729b7b1741a5de99aecb75552 (diff) | |
| parent | 95104c7e257652b82aed089494def344e3938928 (diff) | |
| download | git-64630d807ae0a9717ae39c87bd1458bf15c62142.tar.gz | |
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
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 71429fd743..66c64d7ef2 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 |