From: Phillip Wood <phillip.wood123@gmail•com>
To: Junio C Hamano <gitster@pobox•com>,
Vegard Nossum <vegard.nossum@oracle•com>
Cc: Kristoffer Haugsbakk <code@khaugsbakk•name>,
git@vger•kernel.org, Jonathan Nieder <jrnieder@gmail•com>
Subject: Re: [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands
Date: Wed, 7 Feb 2024 14:03:16 +0000 [thread overview]
Message-ID: <4e6d503a-8564-4536-82a7-29c489f5fec3@gmail.com> (raw)
In-Reply-To: <xmqqcytal01i.fsf@gitster.g>
On 06/02/2024 03:54, Junio C Hamano wrote:
> Vegard Nossum <vegard.nossum@oracle•com> writes:
>
>> On 06/02/2024 00:09, Junio C Hamano wrote:
> Perhaps it is a good idea to squash them together as a single bugfix
> patch?
I think so, I'm not sure we want to add a new test file just for this
either. Having the test in a separate file was handy for debugging but
I think something like the diff below would suffice though I wouldn't
object to checking the author of the cherry-picked commit
Best Wishes
Phillip
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c5f30554c6..84a92d6da0 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -153,6 +153,18 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
git rebase --continue
'
+test_expect_success 'cherry-pick works with rebase --exec' '
+ test_when_finished "git cherry-pick --abort; \
+ git rebase --abort; \
+ git checkout primary" &&
+ echo "exec git cherry-pick G" >todo &&
+ (
+ set_replace_editor todo &&
+ test_must_fail git rebase -i D D
+ ) &&
+ test_cmp_rev G CHERRY_PICK_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 &&
next prev parent reply other threads:[~2024-02-07 14:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 9:18 [PATCH] t/t3515-cherry-pick-rebase.sh: new testcase demonstrating broken behavior Vegard Nossum
2024-02-04 11:14 ` Phillip Wood
2024-02-05 14:13 ` [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands Vegard Nossum
2024-02-05 14:38 ` Kristoffer Haugsbakk
2024-02-05 23:09 ` Junio C Hamano
2024-02-05 23:14 ` Vegard Nossum
2024-02-06 3:54 ` Junio C Hamano
2024-02-07 14:03 ` Phillip Wood [this message]
2024-02-07 16:39 ` Junio C Hamano
2024-02-08 8:48 ` Vegard Nossum
2024-02-08 14:26 ` Phillip Wood
2024-02-08 17:20 ` Junio C Hamano
2024-02-11 11:11 ` Phillip Wood
2024-02-11 17:05 ` Junio C Hamano
2024-02-15 14:24 ` Vegard Nossum
2024-02-15 17:36 ` Junio C Hamano
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=4e6d503a-8564-4536-82a7-29c489f5fec3@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=code@khaugsbakk$(echo .)name \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=vegard.nossum@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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