On Mon, Apr 24, 2017 at 11:05:15PM -0700, Junio C Hamano wrote: > Jeff King <peff@xxxxxxxx> writes: > > > Good point. There's only one caller, but it does care about being in > > that directory. > > > >> Second try that hopefully is much less damaging > > I've been carrying it as a SQUASH??? patch, but I think it is better > to split it as a separate pach, as removal of $remove_trash is an > optional thing. The main thing, i.e. SZEDER's "abort when trash is > already gone or when we cannot remove" _can_ be (and is) correctly > done with his pach alone. Sort of. It still has the bug that it dies with error() when "--debug" is used. But that is relatively minor, and as long as yours gets applied on top I do not mind the momentary breakage. > So here is what I queued on top. > > -- >8 -- > Subject: [PATCH] test-lib: retire $remove_trash variable Yeah, this looks fine (though it could mention that it is fixing the "test -d" bug). -Peff