rerere fails to record resolution if file doesn't exist in merge base

["Uwe Kleine-König" <ukleinek@informatik.uni-freiburg.de>]

Hello,

Some time ago, I sent a test for that[1], but the patch doesn't apply
anymore.

Anyhow, the failure still exists, even though the original report was
sent when rerere was still a perl script ...

	zeisberg@cassiopeia:/tmp/rerere$ git init
	Initialized empty Git repository in .git/
	zeisberg@cassiopeia:/tmp/rerere$ mkdir .git/rerere
	zeisberg@cassiopeia:/tmp/rerere$ echo just something to commit > file
	zeisberg@cassiopeia:/tmp/rerere$ git add file
	zeisberg@cassiopeia:/tmp/rerere$ git commit -m 1
	Created initial commit 51384cb: 1
	 1 files changed, 1 insertions(+), 0 deletions(-)
	 create mode 100644 file
	zeisberg@cassiopeia:/tmp/rerere$ git branch b
	zeisberg@cassiopeia:/tmp/rerere$ echo lala > lolo
	zeisberg@cassiopeia:/tmp/rerere$ git add lolo
	zeisberg@cassiopeia:/tmp/rerere$ git commit -m 2
	Created commit 98b91cc: 2
	 1 files changed, 1 insertions(+), 0 deletions(-)
	 create mode 100644 lolo
	zeisberg@cassiopeia:/tmp/rerere$ git checkout b
	Switched to branch "b"
	zeisberg@cassiopeia:/tmp/rerere$ echo lali > lolo
	zeisberg@cassiopeia:/tmp/rerere$ git add lolo
	zeisberg@cassiopeia:/tmp/rerere$ git commit -m 2a
	Created commit bb900f3: 2a
	 1 files changed, 1 insertions(+), 0 deletions(-)
	 create mode 100644 lolo
	zeisberg@cassiopeia:/tmp/rerere$ git pull . master
	Auto-merged lolo
	CONFLICT (add/add): Merge conflict in lolo
	Automatic merge failed; fix conflicts and then commit the result.
	zeisberg@cassiopeia:/tmp/rerere$ perl -n -i -e "print if /^l/" lolo
	zeisberg@cassiopeia:/tmp/rerere$ cat lolo
	lali
	lala
	zeisberg@cassiopeia:/tmp/rerere$ git rerere
	zeisberg@cassiopeia:/tmp/rerere$ 

In my eyes the last command should have recorded the resolution for
lolo, shouldn't it?

Best regards
Uwe

[1] http://article.gmane.org/gmane.comp.version-control.git/19267

-- 
Uwe Kleine-König

http://www.google.com/search?q=1+stone%3D