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

diff.noprefix breaks rebase

From
TTTarmo Tänav <tarmo@itech.ee>
Date
Aug 31, 2010, 12:53 UTC
Message-ID
<1283259185.24737.12.camel@localhost>
Hi,

It seems that diff.noprefix causes rebase to misplace files that exist in paths that have names similiar to the git diff default prefixes. So a commit that adds /db/somefile will after a rebase place the file into /somefile.

Example test-case below:

mkdir test cd test git init touch x git add x git commit -m x touch z git add z git commit -m z mkdir db touch db/y git add db git commit -m db git config diff.noprefix true git rebase --onto master^^ master^ master ls -R .: x y

expecting to see: ls -R .: db x

./db: y

Regards, Tarmo

Message 1 of 1 in “diff.noprefix breaks rebase”
  1. Tarmo TänavAug 31, 2010

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.