From: Alex Riesen <raa.lkml@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Sebastian Thiel <byronimo@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: Bug Report ( including test script ): Non-Fastforward merges misses directory deletion
Date: Fri, 19 Feb 2010 08:40:47 +0100 [thread overview]
Message-ID: <81b0412b1002182340w71aa6364tfe2e17ad6fd1b1e8@mail.gmail.com> (raw)
In-Reply-To: <20100219055721.GC22645@coredump.intra.peff.net>
On Fri, Feb 19, 2010 at 06:57, Jeff King <peff@peff.net> 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 <raa.lkml@gmail.com>
> 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
prev parent reply other threads:[~2010-02-19 7:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 10:00 Bug Report ( including test script ): Non-Fastforward merges misses directory deletion Sebastian Thiel
2010-02-18 11:43 ` Sebastian Thiel
2010-02-19 5:57 ` Jeff King
2010-02-19 6:23 ` Junio C Hamano
2010-02-19 7:40 ` Alex Riesen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b0412b1002182340w71aa6364tfe2e17ad6fd1b1e8@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=byronimo@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).