summaryrefslogtreecommitdiff
path: root/t/t9163-git-svn-reset-clears-caches.sh
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2014-06-16 00:01:25 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-16 13:29:16 -0700
commit95104c7e257652b82aed089494def344e3938928 (patch)
treeee8b3a07a8fe7a334a146110fe69ee2328558ce4 /t/t9163-git-svn-reset-clears-caches.sh
parentGit 1.9.4 (diff)
downloadtgif-95104c7e257652b82aed089494def344e3938928.tar.xz
rebase--merge: fix --skip with two conflicts in a row
If git rebase --merge encountered a conflict, --skip would not work if the next commit also conflicted. The msgnum file would never be updated with the new patch number, so no patch would actually be skipped, resulting in an inescapable loop. Update the msgnum file's value as the first thing in call_merge. This also avoids an "Already applied" message when skipping a commit. There is no visible change for the other contexts in which call_merge is invoked, as the msgnum file's value remains unchanged in those situations. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9163-git-svn-reset-clears-caches.sh')
0 files changed, 0 insertions, 0 deletions