Re: [PATCH 12/14] revert: Introduce --reset to cleanup sequencer data

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jul 6, 2011, 10:14 UTC
Message-ID: <20110706101423.GI15682@elie>
In-Reply-To: <1309938868-2028-13-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra wrote:

>  This is perfect but for the fact that 'git reset --hard' doesn't blow
>  away the sequencer state.  Why I haven't implemented that yet: should
>  ONLY a hard reset blow away the state?

I don't know.  What do you think?

The constraints I see are:

 1. outside scripts that use "git cherry-pick" should continue to work

 2. as a small indication that that's vaguely possible, unrelated parts
    of the test suite should not need to be patched

 3. when a person uses commands like "git reset --hard" without
   _intending_ to blow away the sequencer state, it should be possible
   to get the sequencer state back.

For dealing with "git rebase --interactive" and similar porcelain-ish scripts, the CHERRY_PICK_HEAD code-path has its own trick of falling back to traditional behavior when the GIT_CHERRY_PICK_HELP environment variable is set (see v1.5.4-rc0~106^2~1, revert/cherry-pick: Allow overriding the help text by the calling Porcelain, 2007-11-28).