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

git apply fails to apply a renamed file in a new directory

From
Sam Ravnborg <sam@ravnborg.org>
Date
Oct 25, 2007, 18:07 UTC
Message-ID
<20071025180737.GA13829@uranus.ravnborg.org>

I just stumbled on what looks like a simple bug in git apply. I had following diff:

diff --git a/arch/i386/defconfig b/arch/x86/configs/i386_defconfig
similarity index 100%
rename from arch/i386/defconfig
rename to arch/x86/configs/i386_defconfig
diff --git a/arch/x86_64/defconfig b/arch/x86/configs/x86_64_defconfig
similarity index 100%
rename from arch/x86_64/defconfig
rename to arch/x86/configs/x86_64_defconfig

-- 
1.5.3.4.1157.g0e74-dirty

When trying to apply this diff using:
git apply -p1 < .../patch

I noticed that the two defconfig files were deleted as expected,
but the renamed versions did not appear in the arch/x86/configs/
directory.
The configs/ directory did not exist and was not created.
Without looking at git apply I assume that the rename failed because
it is not prepared to rename a file to a directory that does not exist.

Buried in other stuff so I did not take a look myself..

	Sam
Next: Alex Riesen
Message 1 of 4 in “git apply fails to apply a renamed file in a new directory”
  1. Sam RavnborgOct 25, 2007
  2. Alex RiesenOct 25, 2007
  3. Alex RiesenOct 25, 2007
  4. Sam RavnborgOct 25, 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.