From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] [WIP] sequencer.c: carry forward notes on HEAD across "rebase -x"
Date: Fri, 12 Mar 2021 13:26:38 +0100 [thread overview]
Message-ID: <87k0qcfthd.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20210312030107.1849942-3-gitster@pobox.com>
On Fri, Mar 12 2021, Junio C Hamano wrote:
> +# NEEDSWORK: Fix c762aada1ab3a2c428c with s/@/HEAD/;
> +
> test_expect_success 'rebase -x with empty command fails' '
> test_when_finished "git rebase --abort ||:" &&
> test_must_fail env git rebase -x "" @ 2>actual &&
> @@ -867,6 +869,22 @@ test_expect_success 'rebase -i can copy notes over a fixup' '
> test_cmp expect output
> '
I eyeballed c762aada1ab (rebase -x: sanity check command, 2019-01-29)
for a bit and still don't quite know what this HEAD v.s. @ is about in
that context, seems this is a stray FIXME comment for an unrelated test.
Maybe it would be better to have test_expect_failure etc. here as
appropriate?
> +test_expect_success 'notes are copied even rebase -x changes HEAD' '
> + git reset --hard n3 &&
> + git rebase -x "git commit --amend --no-edit" n1^1 &&
> + git log --format="%s <%N>" n1^1..n3 >expect &&
> + git log --format="%s <%N>" n1^1..HEAD >actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_failure 'notes are copied even rebase -x changes HEAD' '
> + git reset --hard n3 &&
> + git rebase -x "git commit --amend -m tweak" n1^1 &&
> + git log --format="tweak <%N>" n1^1..n3 >expect &&
> + git log --format="%s <%N>" n1^1..HEAD >actual &&
> + test_cmp expect actual
> +'
> +
> test_expect_success 'rebase while detaching HEAD' '
> git symbolic-ref HEAD &&
> grandparent=$(git rev-parse HEAD~2) &&
next prev parent reply other threads:[~2021-03-12 12:27 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 ` [PATCH 0/2] "rebase -x cmd" loses notes Junio C Hamano
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 [this message]
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=87k0qcfthd.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).