Subject: Re: [PATCH] git-am: Don't accept an mbox on stdin of we already have a .dotest directory

From: Lukas Sandström <[email-masked]>
Date: Thu, 20 Jul 2006 21:35:25 +0200

Petr Baudis wrote:
> Dear diary, on Wed, Jul 19, 2006 at 10:28:00PM CEST, I got a letter
> where Lukas Sandström <[email-masked]> said that...
>> Signed-off-by: Lukas Sandström <[email-masked]>
>> ---
> 
> Please don't be afraid of putting stuff to commit message. It can only
> improve things. :-)
> 
>> # git format-patch -k -3 master..conflict | git am -k -3
>> => git-am fails with a conflict message
>> # git reset --hard
>>
>> # git format-patch -k -3 master..ok | git am -k -3
>> => git am fails with the same conflict message as above,
>> => since it's trying to apply the old .dotest directory
>>
>> With the patch it complains about an old .dotest
>> directory instead.
> 
> I think this rather means that git reset --hard should clear the .dotest
> directory, or something (perhaps just warn)...

But the .dotest directory is user-selectable in git-am.

> 
>> -	test ",$#," = ",0," ||
>> +	if test ",$#," != ",0," || ! tty -s
> 
> ...but this looks like a horrible idea. Does this mean that git-am can't
> be now ran without a terminal? (E.g. in a cron/at job, inside a procmail
> rule etc.) That's bad.
> 

This would only stop it from running without a terminal if you have an old
.dotest directory lying around, ie. you already have a failed am-session.
git-am wouldn't work in this case before either, all the patch does is to
give a better error-message.

/Lukas