Re: Two bugs with renaming

From: Jeff King <peff@peff.net>
Date: Mar 20, 2008, 00:56 UTC
Message-ID: <20080320005633.GA22736@coredump.intra.peff.net>
In-Reply-To: <slrnfu37vn.d2i.jgoerzen@katherina.lan.complete.org>

On Wed, Mar 19, 2008 at 06:21:27PM -0500, John Goerzen wrote:

> Bug #1 causes git to refuse to change to a different branch, claiming
> that uncommitted changes exist, even when git status says there are none.
> [...]
> Tested with Git 1.5.4.4.

I tried to reproduce this with current 'master', and it seems to be magically fixed. There has been some work on unpack-trees lately, so it might be a fallout from that.

Show 7 quoted lines

> Bug #2 causes git to refuse to merge unrelated changes.
> [...]
> lrwxrwxrwx 1 jgoerzen jgoerzen 16 Mar 19 18:14 files -> /tmp/nonexistant
> drwxr-xr-x 2 jgoerzen jgoerzen 22 Mar 19 18:14 files.upstream
> jgoerzen@katherina:/tmp/testrepo$ git merge master
> fatal: Entry 'files/delete.me' would be overwritten by merge. Cannot merge.
> Merge with strategy recursive failed.

Hrm, that should work, I think. I haven't kept up with the recent changes, so I'll have to take some time to investigate.

-Peff