From: Johannes Sixt <j.sixt@viscovery.net>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: git <git@vger.kernel.org>
Subject: Re: [BUG] Silent data loss on merge with uncommited changes + renames
Date: Mon, 22 Apr 2013 16:23:52 +0200 [thread overview]
Message-ID: <517547F8.3040004@viscovery.net> (raw)
In-Reply-To: <vpqobd6q5nm.fsf@grenoble-inp.fr>
Am 4/22/2013 11:24, schrieb Matthieu Moy:
> Following the discussion on "merge with uncommited changes" inside the
> "git pull --autostash" thread, I did a bit of testing, and encountered a
> case with silent data loss. In short: merge a branch introducing changes
> to a file. If the file has been renamed in the current branch, then "git
> merge" follows the rename and brings changes to the renamed file, but
> uncommited changes in this file are overriden silently.
Can you check whether your case is already covered by one of:
git grep expect_failure t/*merge*
and if not, contribute a test case?
-- Hannes
next prev parent reply other threads:[~2013-04-22 14:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 9:24 [BUG] Silent data loss on merge with uncommited changes + renames Matthieu Moy
2013-04-22 14:23 ` Johannes Sixt [this message]
2013-04-22 14:43 ` Matthieu Moy
2013-04-22 15:19 ` Junio C Hamano
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=517547F8.3040004@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox