From: Alex Riesen Date: Fri, 19 Feb 2010 07:40:47 GMT Subject: Re: Bug Report ( including test script ): Non-Fastforward merges misses directory deletion Message-ID: <81b0412b1002182340w71aa6364tfe2e17ad6fd1b1e8@mail.gmail.com> In-Reply-To: <20100219055721.GC22645@coredump.intra.peff.net> On Fri, Feb 19, 2010 at 06:57, Jeff King wrote: > On Thu, Feb 18, 2010 at 11:43:23AM +0000, Sebastian Thiel wrote: > If we remove a path in a/deep/subdirectory, we should try to > remove as many trailing components as possible (i.e., > subdirectory, then deep, then a). However, the test for the > return value of rmdir was reversed, so we only ever deleted > at most one level. What was I thinking! Sincerely-sorry: Alex Riesen > This was introduced by Alex's 4a92d1b (Add remove_path: a function to > remove as much as possible of a path, 2008-09-27), which ironically > complained about bugs in the code it was replacing. :) Well, it did fix the bugs it claimed to fix