Patrick Steinhardt [off-list ref] writes:
That doesn't specifically mean that this one test you add here is not
useful. But we need to have a better argument than "we didn't have it
yet".
Dropped the test. I went looking for that better argument and did not
find one: t3507 already has 'cherry-pick --no-commit does not set
CHERRY_PICK_HEAD' for the clean pick, and the clean and the conflicting
path go through the same !opts->no_commit guard in do_pick_commit(), so
the regression I described is covered already.
v2 is the documentation change alone.