undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'aj/fix-read-tree-from-scratch'

Browse Source 
* aj/fix-read-tree-from-scratch:
  read-tree: Fix regression with creation of a new index file.
This commit is contained in:
Junio C Hamano 2009-08-25 14:48:15 -07:00
commit 31f0bce853
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-read-tree.c
View File

@ -113,13 +113,15 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
argc = parse_options(argc, argv, unused_prefix, read_tree_options, argc = parse_options(argc, argv, unused_prefix, read_tree_options,
read_tree_usage, 0); read_tree_usage, 0);
if (read_cache_unmerged() && (opts.prefix || opts.merge))
die("You need to resolve your current index first");
prefix_set = opts.prefix ? 1 : 0; prefix_set = opts.prefix ? 1 : 0;
if (1 < opts.merge + opts.reset + prefix_set) if (1 < opts.merge + opts.reset + prefix_set)
die("Which one? -m, --reset, or --prefix?"); die("Which one? -m, --reset, or --prefix?");
stage = opts.merge = (opts.reset || opts.merge || prefix_set);
if (opts.reset || opts.merge || opts.prefix) {
if (read_cache_unmerged() && (opts.prefix || opts.merge))
die("You need to resolve your current index first");
stage = opts.merge = 1;
}
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];

25
t/t1009-read-tree-new-index.sh Executable file
View File

@ -0,0 +1,25 @@
#!/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