From: "Shawn O. Pearce" <spearce@spearce.org>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Remove empty directories in recursive merge
Date: Fri, 26 Sep 2008 08:06:36 -0700 [thread overview]
Message-ID: <20080926150636.GA17584@spearce.org> (raw)
In-Reply-To: <20080925203329.GC3959@blimp.localhost>
Alex Riesen <raa.lkml@gmail.com> wrote:
> Alex Riesen, Thu, Sep 25, 2008 22:12:45 +0200:
> > The code was actually supposed to do that, but was accidentally broken.
> > Noticed by Anders Melchiorsen.
> >
> > Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
>
> Shawn, the change is intentionally based on Junios master,
Actually I think this is 'maint' worthy. It applies clean there.
I'm trying to slate it for maint.
> so people can just apply it. But if you wish, I can rebase it on top
> of Miklos' patches.
Its small. I can manage to merge it over myself. Thanks.
--
Shawn.
next prev parent reply other threads:[~2008-09-26 15:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-24 16:32 [BUG] git merge does not prune empty directories Anders Melchiorsen
2008-09-25 20:12 ` [PATCH] Remove empty directories in recursive merge Alex Riesen
2008-09-25 20:17 ` [PATCH] Cleanup remove_path Alex Riesen
2008-09-25 20:22 ` [PATCH] Fix memleak and the implementation of remove_file in builtin-rm.c Alex Riesen
2008-09-26 15:28 ` Shawn O. Pearce
2008-09-26 22:56 ` [PATCH] Add remove_path: a function to remove as much as possible of a path Alex Riesen
2008-09-26 22:59 ` [PATCH] Use remove_path from dir.c instead of own implementation Alex Riesen
2008-09-25 20:33 ` [PATCH] Remove empty directories in recursive merge Alex Riesen
2008-09-26 15:06 ` Shawn O. Pearce [this message]
2008-09-26 5:58 ` Johannes Sixt
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=20080926150636.GA17584@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=raa.lkml@gmail.com \
/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).