Re: [PATCH 1/2] t3507: pin CHERRY_PICK_HEAD absence for a conflicting --no-commit
- From
Aleksei Sviridkin <f@lex.la>
- Date
- Sep 5, 2026, 17:13 UTC
- Message-ID
- <20260905171349.34798-1-f@lex.la>
- In-Reply-To
- <apqSXT4lT7v0ILjp@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
> But we need to have a better argument than "we didn't have it yet".
Correcting my earlier mail: I said I was dropping the test because the existing clean-pick test covered it, and that is wrong. The clean pick is checked, the conflicting one is not.
The justification is the condition itself: whether CHERRY_PICK_HEAD is written depends on the command, on whether the merge started, and on --no-commit, all in one place. v3 puts it back as a single test_ref_missing call in an existing test, so no new test and no new setup.