From: Thomas Rast <trast@student.ethz.ch>
To: <git@vger.kernel.org>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [BUG] merge into unborn branch resets index+WT even if populated
Date: Tue, 17 Aug 2010 09:45:31 +0200 [thread overview]
Message-ID: <201008170945.31850.trast@student.ethz.ch> (raw)
Hi,
I'm posting this on behalf of Dscho who reported it on IRC, but
apparently doesn't have the time for email.
If you run the following sequence of commands:
git init
echo foo > somefile
git add somefile
git pull elsewhere master
(where 'elsewhere' is any repo having a master branch) the "merge into
unborn branch" logic silently nukes the index AND worktree copy of
"somefile", thereby losing it. The same works with fetch+merge, so
it's not pull's fault.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next reply other threads:[~2010-08-17 7:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 7:45 Thomas Rast [this message]
2010-08-22 21:06 ` [PATCH] Exhibit merge bug that clobbers index&WT Thomas Rast
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=201008170945.31850.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/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 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).