diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-03-03 09:11:54 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-04 13:31:04 +0900 |
| commit | eaf81605b8d17cc15a4a72ffd99d71111b70815b (patch) | |
| tree | 3ef9819971171c9b8a11d64d7c5e00a56614eaf7 /builtin | |
| parent | built-in rebase: no need to check out `onto` twice (diff) | |
| download | tgif-eaf81605b8d17cc15a4a72ffd99d71111b70815b.tar.xz | |
built-in rebase: use the correct reflog when switching branches
By mistake, we used the reflog intended for ORIG_HEAD.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 813ec284ca..aa469ec964 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -475,7 +475,7 @@ reset_head_refs: detach_head ? REF_NO_DEREF : 0, UPDATE_REFS_MSG_ON_ERR); else { - ret = update_ref(reflog_orig_head, switch_to_branch, oid, + ret = update_ref(reflog_head, switch_to_branch, oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR); if (!ret) ret = create_symref("HEAD", switch_to_branch, |