* diff.noprefix breaks rebase
@ 2010-08-31 12:53 Tarmo Tänav
0 siblings, 0 replies; only message in thread
From: Tarmo Tänav @ 2010-08-31 12:53 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-31 13:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-31 12:53 diff.noprefix breaks rebase Tarmo Tänav
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).