Re: [PATCH 1/2] am: handle stray $dotest directory
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jun 15, 2013, 12:35 UTC
- Message-ID
- <CALkWK0nRtrvd=oX04XfqovYg1dnx3h+aNSNWH6MXnssOBqz=xw@mail.gmail.com>
- In-Reply-To
- <7vbo78o6ut.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> I _think_ the new check you added may be too loose.
Yep, I totally forgot about the case when git-am.sh is called from an existing script. In that case, it is upto the caller to handle whatever stray directories; we have no business meddling with that.
> A fix-up may look like this.
No, don't leak autostash detail.
Just change that condition to
if test -d "$dotest" && test -z "$rebasing"
and we're done. I'll send in a re-roll.