From: Junio C Hamano Date: Sun, 14 Aug 2011 22:30:33 GMT Subject: Re: [PATCH 7/7] sequencer: Remove sequencer state after final commit Message-ID: <7vippzlj7a.fsf@alter.siamese.dyndns.org> In-Reply-To: <20110814213200.GA6555@elie.gateway.2wire.net> Jonathan Nieder writes: > I believe it is meant to support command sequences such as these: > > 1. > git cherry-pick foo; # has conflicts > ... resolve conflicts and "git add" the resolved files ... > git commit > git cherry-pick bar Why does a single commit "cherry-pick foo" leave any sequencer state that may interfere with the latter to begin with? Isn't that already a bug? > 2. > git cherry-pick foo bar; # has conflicts applying "bar" > ... resolve ... > git commit > git cherry-pick baz > > Those were intuitive things to do before the sequencer existed, and if > I understand correctly, d3f4628e was intended to support people and > scripts (such as the test suite) that have these commands wired into > their fingers. Given that the latter was broken when "foo" stopped with conficts (it lost "bar" altogether anyway), I am not worried about it, and I do not care much about anybody who had wired such multi-pick into scripts or fingers, either. IOW, I do not necessarily agree with your "those were intuitive" assertion.