git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Remove empty directories in recursive merge

From
Shawn O. Pearce <spearce@spearce.org>
Date
Sep 26, 2008, 15:06 UTC
Message-ID
<20080926150636.GA17584@spearce.org>
In-Reply-To
<20080925203329.GC3959@blimp.localhost>
Alex Riesen <raa.lkml@gmail.com> wrote:
Show 7 quoted lines
> 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.
Previous: Alex RiesenNext: Johannes Sixt
Message 9 of 10 in “[BUG] git merge does not prune empty directories”
  1. Anders MelchiorsenSep 24, 2008
  2. Remove empty directories in recursive mergeAlex Riesen, Sep 25, 2008
  3. Cleanup remove_pathAlex Riesen, Sep 25, 2008
  4. Fix memleak and the implementation of remove_file in builtin-rm.cAlex Riesen, Sep 25, 2008
  5. Shawn O. PearceSep 26, 2008
  6. Add remove_path: a function to remove as much as possible of a pathAlex Riesen, Sep 26, 2008
  7. Use remove_path from dir.c instead of own implementationAlex Riesen, Sep 26, 2008
  8. Alex RiesenSep 25, 2008
  9. Shawn O. PearceSep 26, 2008
  10. Johannes SixtSep 26, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.