From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Jun 2013 15:17:29 GMT
Subject: Re: [PATCH 1/2] am: handle stray $dotest directory
Message-ID: <7v61xgraba.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vli6crau5.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

>> +	# Possible stray $dotest directory
>> +	if test -d "$dotest"; then
>> +	case "$skip,$resolved,$abort" in
>> +		,,t)
>> +			rm -fr "$dotest"
>> +			exit 0
>> +			;;
>> +		*)
>> +			die "$(eval_gettext "Stray $dotest directory found.
>> +Use \"git am --abort\" to remove it.")"
>> +			;;
>> +	esac
>
> These two case arms are indented one level too deep (will locally
> touch up).

And then the message triggers at the second test in t3420 when
applied on top of 587947750bd7 (rebase: implement --[no-]autostash
and rebase.autostash, 2013-05-12) or 45acb7592825 (Merge branch
'rr/rebase-autostash', 2013-06-11).