mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
db137fe91e
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>
25 lines
427 B
Bash
Executable file
25 lines
427 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test read-tree into a fresh index file'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo one >a &&
|
|
git add a &&
|
|
git commit -m initial
|
|
'
|
|
|
|
test_expect_success 'non-existent index file' '
|
|
rm -f new-index &&
|
|
GIT_INDEX_FILE=new-index git read-tree master
|
|
'
|
|
|
|
test_expect_success 'empty index file' '
|
|
rm -f new-index &&
|
|
> new-index &&
|
|
GIT_INDEX_FILE=new-index git read-tree master
|
|
'
|
|
|
|
test_done
|
|
|