read-tree: Fix regression with creation of a new index file.
authorAlexandre Julliard <julliard@winehq.org>
Mon, 17 Aug 2009 15:35:44 +0000 (17:35 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Aug 2009 16:20:52 +0000 (09:20 -0700)
commitdb137fe91ea4afda7a2073364c610fe61dc769b8
tree809ba0f3a75bef1c74693daf5153573caf3c53eb
parent5a56da58060e50980fab0f4c38203a25440d1530
read-tree: Fix regression with creation of a new index file.

Reading the index into an empty file has been broken by
5a56da58060e50980fab0f4c38203a25440d1530, since it causes the existing
index to always be loaded first, and dies if it's an empty file:

$ GIT_INDEX_FILE=`mktemp` git read-tree master
fatal: index file smaller than expected

It breaks for instance committing from git.el. This patch reverts to the
previous behavior of only loading the index when merging it.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-read-tree.c
t/t1009-read-tree-new-index.sh [new file with mode: 0755]