summaryrefslogtreecommitdiff
path: root/sha1dc_git.h
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2022-01-26 13:05:48 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-26 12:08:53 -0800
commitcd1528ef8ef9847fc27cff4016bf073f04729504 (patch)
tree54e0d712139312788ffc4929e8352d042c60944f /sha1dc_git.h
parentrebase --apply: fix reflog (diff)
downloadtgif-cd1528ef8ef9847fc27cff4016bf073f04729504.tar.xz
rebase --apply: set ORIG_HEAD correctly
At the start of a rebase, ORIG_HEAD is updated to the tip of the branch being rebased. Unfortunately reset_head() always uses the current value of HEAD for this which is incorrect if the rebase is started with "git rebase <upstream> <branch>" as in that case ORIG_HEAD should be updated to <branch>. This only affects the "apply" backend as the "merge" backend does not yet use reset_head() for the initial checkout. Fix this by passing in orig_head when calling reset_head() and add some regression tests. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1dc_git.h')
0 files changed, 0 insertions, 0 deletions