Re: qgit idea: interface for cherry-picking

From: Marco Costalba <mcostalba@gmail.com>
Date: Jul 3, 2006, 11:18 UTC
Message-ID: <e5bfff550607030418n6a46c0cdh1a95155e1feb4356@mail.gmail.com>
In-Reply-To: <7vzmfrrxyp.fsf@assigned-by-dhcp.cox.net>

On 7/3/06, Junio C Hamano <junkio@cox.net> wrote:

Show 13 quoted lines

> "Marco Costalba" <mcostalba@gmail.com> writes:
>
> > When I need to modify the patch/revision before to import I usaually
> > drag&drop and then I call git-reset --soft, then I edit working
> > directory and commit again.
>
> These days, I tend to just let "am" or "pull" do its thing, edit
> working tree and retest, and run "commit --amend".  Before we
> added "commit --amend", I used to do soft reset and recommit
> like you described above.  One advantage of "commit --amend" is
> that it can even amend a merge, but I do not think it applies to
> what Jakub wants in this thread.
>

I cannot test your patch now, so I'm just guessing, what if we have a series of patches? Is it possible that for two patches A and B happens that

git-am A git-am B git-reset --soft HEAD^^

gives a different result then

git-am --fail A git-am --fail B

As example, if B modify the same file of A then could happen that in the latter case git-am --fail B stops with conflicts because the working dir is not synced with the index (this happens only in the latter case) ?

Put in other words, I don't know if the two procedures are _equivalent_ because in the first case you operate under the assumption that working dir and index are always synced before and after to apply, in the second case this assumption is broken so I don't know if this could have side effects.

      Marco