From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Nazri Ramliy <ayiehere@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 2/4] built-in rebase: use the correct reflog when switching branches
Date: Thu, 28 Feb 2019 07:27:46 -0800 (PST) [thread overview]
Message-ID: <b92d76065d92cb7003dd9d69525a1ed790a93921.1551367664.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.153.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
By mistake, we used the reflog intended for ORIG_HEAD.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
builtin/rebase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 @@ static int reset_head(struct object_id *oid, const char *action,
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,
--
gitgitgadget
next prev parent reply other threads:[~2019-02-28 15:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 15:27 [PATCH 0/4] Fix ORIG_HEAD behavior of the built-in rebase Johannes Schindelin via GitGitGadget
2019-02-28 15:27 ` [PATCH 1/4] built-in rebase: no need to check out `onto` twice Johannes Schindelin via GitGitGadget
2019-02-28 20:55 ` Phillip Wood
2019-03-01 13:19 ` Johannes Schindelin
2019-03-01 15:00 ` Phillip Wood
2019-03-03 1:35 ` Junio C Hamano
2019-03-03 17:09 ` Johannes Schindelin
2019-03-03 19:11 ` Phillip Wood
2019-02-28 15:27 ` Johannes Schindelin via GitGitGadget [this message]
2019-02-28 15:27 ` [PATCH 4/4] built-in rebase: set ORIG_HEAD just once, before the rebase Johannes Schindelin via GitGitGadget
2019-02-28 15:27 ` [PATCH 3/4] built-in rebase: demonstrate that ORIG_HEAD is not set correctly Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 0/4] Fix ORIG_HEAD behavior of the built-in rebase Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 1/4] built-in rebase: no need to check out `onto` twice Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 3/4] built-in rebase: demonstrate that ORIG_HEAD is not set correctly Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 2/4] built-in rebase: use the correct reflog when switching branches Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 4/4] built-in rebase: set ORIG_HEAD just once, before the rebase Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b92d76065d92cb7003dd9d69525a1ed790a93921.1551367664.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=ayiehere@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).