Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

From: Stephan Beyer <s-beyer@gmx.net>
Date: Jul 23, 2008, 16:47 UTC
Message-ID: <20080723164739.GB17648@leksak.fem-net>
In-Reply-To: <48874617.3010108@free.fr>

Hi,

Olivier Marin wrote:

Show 6 quoted lines

> > The reason of my question was that I *blindly* incorporated the change into
> > sequencer to make it able to work on a dirty working tree and thus to be
> > able to migrate am onto it without losing the ability to apply patches
> > on a dirty working tree....
> 
> Are you talking about your seq-proto-dev3 branch?

Right, and your suggested changes are right, too, and I've incorporated them yesterday (with an --allow-dirty option) but I hadn't commited them... (Hence, not pushed.)

> > Now, because t4151 does not pass, I am wondering what's the best thing
> > I could do...

Well, that was solved... The problem was that the additional "HEAD" (that made t4151 work), resulted in untracked files in some test cases of sequencer and rebase-i. Those made merges fail, because these merges would overwrite these files. So the merges failed, and the test cases failed.

I've solved this with the trick that the "HEAD" argument is only added if --allow-dirty is set (and git-am uses --allow-dirty of course).

This is perhaps not the cleanest way but seemed to be far more better than forcing overwrites on merges (checkouts, etc.).

> Ah, you should change "Applying 6" with "Applying \"6\"" in t4151-am-abort.sh
> too.

I btw wondered if the quotes are useful in original am. Well, I've just sent a patch adding a colon (instead of quotes). Let's see ;)

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F