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

From: Petr Baudis <pasky@suse.cz>
Date: Jul 20, 2006, 14:33 UTC
Message-ID: <20060720143353.GK13776@pasky.or.cz>
In-Reply-To: <44BE95D0.9090708@etek.chalmers.se>

Dear diary, on Wed, Jul 19, 2006 at 10:28:00PM CEST, I got a letter where Lukas Sandström <lukass@etek.chalmers.se> said that...

> Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
> ---

Please don't be afraid of putting stuff to commit message. It can only improve things. :-)

Show 10 quoted lines

> # 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)...

> -	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.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam