kernel/git - git - PowerEL Git System

39528 Commits

6 Branches

36 Tags

131 MiB

Tree: adef9561f0

Commit Graph

Author SHA1 Message Date

Author	SHA1	Message	Date
Alexandre Julliard	db137fe91e	read-tree: Fix regression with creation of a new index file. Reading the index into an empty file has been broken by `5a56da5806`, 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>	16 years ago

Alexandre Julliard

db137fe91e

read-tree: Fix regression with creation of a new index file.

Reading the index into an empty file has been broken by
5a56da5806, 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>

16 years ago

1 Commits (adef9561f0c8cf2c974d78adac0ae236e159e49f)