Re: [BUG] Silent data loss on merge with uncommited changes + renames

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Apr 22, 2013, 14:23 UTC
Message-ID: <517547F8.3040004@viscovery.net>
In-Reply-To: <vpqobd6q5nm.fsf@grenoble-inp.fr>

Am 4/22/2013 11:24, schrieb Matthieu Moy:

Show 6 quoted lines

> 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