All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Tarmo Tänav" <tarmo@itech.ee>
To: git@vger.kernel.org
Subject: diff.noprefix breaks rebase
Date: Tue, 31 Aug 2010 15:53:05 +0300	[thread overview]
Message-ID: <1283259185.24737.12.camel@localhost> (raw)

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

                 reply	other threads:[~2010-08-31 13:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1283259185.24737.12.camel@localhost \
    --to=tarmo@itech.ee \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.