From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 04 Aug 2011 01:48:23 GMT
Subject: Re: [PATCH 00/48] Handling more corner cases in merge-recursive.c
Message-ID: <7vaabq6j6g.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7v4o1y81sv.fsf@alter.siamese.dyndns.org>

A very simple reproduction recipe.

-- >8 --
#!/bin/sh

mkdir en && cd en || exit

git init

echo 1 >one
git add one
git commit -m 'origin'

git checkout -b side
git mv one two
git commit -m 'side renames one to two'

git checkout master
echo 2 >one
git add one
git commit -m 'master updates one'

git checkout HEAD^0
git merge side
-- 8< --

Tonight's "pu" fails like this:

$ git merge side
error: addinfo_cache failed for path 'two'
Merge made by the 'recursive' strategy.
 one |    1 -
 two |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)
 delete mode 100644 one
 create mode 100644 two