From: Aleksei Sviridkin Date: Thu, 03 Sep 2026 12:55:23 GMT Subject: [PATCH 1/2] t3507: pin CHERRY_PICK_HEAD absence for a conflicting --no-commit Message-ID: <20260903125524.67889-1-f@lex.la> The tests here check the ref after a conflicting pick, after a clean pick and after a clean pick under --no-commit, but not after a conflicting one under --no-commit. That is the combination a user runs into by accident: the pick stops with conflicts, and the ref "git commit" would take the authorship from is not there. Pin it next to its siblings. Letting the ref be written under --no-commit when the pick conflicts leaves the rest of the cherry-pick tests green, so nothing else guards that path. Assisted-by: LLM Signed-off-by: Aleksei Sviridkin --- t/t3507-cherry-pick-conflict.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 44596cb1e8..2ce2e88184 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -100,6 +100,12 @@ test_expect_success 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD' ' test_must_fail git rev-parse --verify CHERRY_PICK_HEAD ' +test_expect_success 'failed cherry-pick --no-commit does not set CHERRY_PICK_HEAD' ' + pristine_detach initial && + test_must_fail git cherry-pick --no-commit picked && + test_must_fail git rev-parse --verify CHERRY_PICK_HEAD +' + test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' ' pristine_detach initial && echo foo >foo && base-commit: e9019fcafe0040228b8631c30f97ae1adb61bcdc -- 2.55.0