My Various Git Projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6aac81
)
built-in rebase: use the correct reflog when switching branches
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Sun, 3 Mar 2019 17:11:54 +0000
(09:11 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 4 Mar 2019 04:31:04 +0000
(13:31 +0900)
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>
builtin/rebase.c
patch
|
blob
|
history
diff --git
a/builtin/rebase.c
b/builtin/rebase.c
index
813ec28
..
aa469ec
100644
(file)
--- 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,