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

possible bug in git apply?

From
Ddavid@lang.hm <david@lang.hm>
Date
Aug 4, 2007, 19:45 UTC
Message-ID
<Pine.LNX.4.64.0708041243070.6905@asgard.lang.hm>

since git doesn't track directories, only content (per the big discussion recently) I beleive that doing a checkout would leave Rob without the directories that he emptied out, so shouldn't git apply also clear the directories to end up in the same state?

David Lang
---------- Forwarded message ----------
Date: Sat, 4 Aug 2007 15:19:54 -0400
From: Rob Landley <rob@landley.net>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roland Dreier <rdreier@cisco.com>,
     Linux Kernel <linux-kernel@vger.kernel.org>, linux-doc@vger.kernel.org,
     Andrew Morton <akpm@linux-foundation.org>, Paul Mundt <lethal@linux-sh.org>
Subject: Re: [PATCH 1/2] Group architecture Documentation under
     Documentation/arch.
On Saturday 04 August 2007 2:03:59 pm Rob Landley wrote:
> Signed-off-by: Rob Landley <rob@landley.net>
> Amiga part Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> Move architecture-specific Documentation into a common subdirectory.
I really, really, really hate git.

Ok, on my laptop I just noticed that "git apply" of the patch didn't complain but it also left the empty subdirectories it moved stuff out of. (I don't believe this happened on the version of git I was using on my previous laptop, which ate itself a month and change ago, but obviously I can't check.)

There is no "git rmdir". "git rm" refuses to delete the directory without -r. "git rm -r Documentation/x86_64" listed (as just deleted) all the files that the patch already moved out of the directory.

Am I missing something obvious here?
Rob
-- 
"One of my most productive days was throwing away 1000 lines of code."
   - Ken Thompson.
Next: Junio C Hamano
Message 1 of 15 in “possible bug in git apply?”
  1. david@lang.hmAug 4, 2007
  2. Junio C HamanoAug 4, 2007
  3. David KastrupAug 4, 2007
  4. Linus TorvaldsAug 5, 2007
  5. Linus TorvaldsAug 5, 2007
  6. Junio C HamanoAug 5, 2007
  7. David KastrupAug 5, 2007
  8. Linus TorvaldsAug 5, 2007
  9. David KastrupAug 5, 2007
  10. Linus TorvaldsAug 5, 2007
  11. David KastrupAug 5, 2007
  12. Linus TorvaldsAug 5, 2007
  13. David KastrupAug 5, 2007
  14. Junio C HamanoAug 6, 2007
  15. Junio C HamanoAug 6, 2007

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.