Re: [PATCH 00/48] Handling more corner cases in merge-recursive.c

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

On Wed, Aug 3, 2011 at 7:48 PM, Junio C Hamano [off-list ref] wrote:

A very simple reproduction recipe.

Thanks, I'll take a look this weekend.  I'm a little surprised that
you mentioned merging this to next already; I was assuming you wanted
me to address the various things you pointed out in your reviews first
(as well as the comments from Johannes).  I've been swamped at work,
particularly after trying to catch up on the pile of work accumulated
during my vacation, but should have time again this weekend...finally.


Elijah