kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t3507: check no CHERRY_PICK_HEAD after conflicting --no-commit 

Whether CHERRY_PICK_HEAD is written depends on the command, on whether
the merge started, and on --no-commit, all in one condition in
do_pick_commit().  The suite checks the clean --no-commit pick; nothing
checks the conflicting one.

The test that already runs a conflicting --no-commit pick compares the
advice the command prints, which is what tells us it stopped on a
conflict.  Assert the ref is missing there too.

Signed-off-by: Aleksei Sviridkin <f@lex.la>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Aleksei Sviridkin 2026-09-05 20:13:31 +03:00 committed by Junio C Hamano
parent 3cb9185f65
commit 3e4574885f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/t3507-cherry-pick-conflict.sh
View File

@ -79,7 +79,8 @@ test_expect_success 'advice from failed cherry-pick --no-commit' "
EOF
test_must_fail git cherry-pick --no-commit picked 2>actual &&

test_cmp expected actual
test_cmp expected actual &&
test_ref_missing CHERRY_PICK_HEAD
"

test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '