Skip to content

Commit

Permalink
Merge branch 'aj/fix-read-tree-from-scratch'
Browse files Browse the repository at this point in the history
* aj/fix-read-tree-from-scratch:
  read-tree: Fix regression with creation of a new index file.
  • Loading branch information
Junio C Hamano committed Aug 25, 2009
2 parents 3613339 + db137fe commit 31f0bce
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 4 deletions.
10 changes: 6 additions & 4 deletions builtin-read-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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;
if (1 < opts.merge + opts.reset + prefix_set)
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++) {
const char *arg = argv[i];
Expand Down
25 changes: 25 additions & 0 deletions t/t1009-read-tree-new-index.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 31f0bce

Please sign in to comment.