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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html