From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 0/2] "rebase -x cmd" loses notes
Date: Thu, 11 Mar 2021 19:01:05 -0800 [thread overview]
Message-ID: <20210312030107.1849942-1-gitster@pobox.com> (raw)
In-Reply-To: <xmqq8s6tcuxc.fsf@gitster.g>
So here is a semi-failed attempt to fix the issue I encountered
earlier, cf. https://lore.kernel.org/git/xmqq8s6tcuxc.fsf@gitster.g/
where "git rebase" carries forward notes attached to the commits in
the original history to their equivalents in the rewritten history,
but "git rebase -x cmd" does not when cmd modifies the given HEAD
commit.
Junio C Hamano (2):
sequencer.c: make commit_post_rewrite() take two object names
[WIP] sequencer.c: carry forward notes on HEAD across "rebase -x"
builtin/commit.c | 6 +++---
sequencer.c | 19 +++++++++++++------
sequencer.h | 2 +-
t/t3404-rebase-interactive.sh | 18 ++++++++++++++++++
4 files changed, 35 insertions(+), 10 deletions(-)
--
2.31.0-rc2-175-g3820f1c72e
next prev parent reply other threads:[~2021-03-12 3:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 20:11 [BUG] cmd given to "rebase -x cmd" cannot see the original HEAD? Junio C Hamano
2021-03-12 3:01 ` Junio C Hamano [this message]
2021-03-12 3:01 ` [PATCH 1/2] sequencer.c: make commit_post_rewrite() take two object names Junio C Hamano
2021-03-12 3:01 ` [PATCH 2/2] [WIP] sequencer.c: carry forward notes on HEAD across "rebase -x" Junio C Hamano
2021-03-12 11:12 ` Phillip Wood
2021-03-12 12:26 ` Ævar Arnfjörð Bjarmason
2021-03-12 11:09 ` [BUG] cmd given to "rebase -x cmd" cannot see the original HEAD? Phillip Wood
2021-03-12 11:26 ` [WIP][PATCH] rebase: update the list of rewritten commits when amending pick Phillip Wood
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210312030107.1849942-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).