Re: [PATCH 2/3] sequencer: add "--reset-hard" option to "git sequencer--helper"

From: Christian Couder <chriscool@tuxfamily.org>
Date: Aug 4, 2009, 21:17 UTC
Message-ID: <200908042317.26408.chriscool@tuxfamily.org>
In-Reply-To: <alpine.LNX.2.00.0908041111550.2147@iabervon.org>

On Tuesday 04 August 2009, Daniel Barkalow wrote:

Show 7 quoted lines

> On Mon, 3 Aug 2009, Christian Couder wrote:
> > This new option uses the "reset_almost_hard()" function to perform
> > a reset.
>
> Shouldn't it make it possible to do an almost-hard reset (that is, keep a
> dirty working tree's changes while changing the index and HEAD to a
> different commit)?

Yeah, I will improve the documentation of this function as Junio requested.

Show 9 quoted lines

> AFAICT, this series doesn't expose the interesting new 
> functionality it provides.
>
> Also, I thought that we'd found that other built-ins could be simplified
> through the use of functions you're adding here. In particular, checkout
> wants to change the index and working tree while preserving dirty working
> tree changes. So it would probably be better for it to go in a library
> object, where sequencer--helper would just make it available to shell
> code.

Yeah, I agree, but right now I'd rather keep the code quite close to what it is on the sequencer repo if possible.

Thanks, Christian.