diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-08 17:27:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-08 17:27:43 -0700 |
| commit | b1f47514f207b0601de7b0936cf13b3c0ae70081 (patch) | |
| tree | 351921dd5f5bec0f58804cd94f426006f81b6c38 | |
| parent | 29981380d03ffa63765dbeaea53a7ac9e8d6bc4f (diff) | |
| download | git-b1f47514f207b0601de7b0936cf13b3c0ae70081.tar.gz git-b1f47514f207b0601de7b0936cf13b3c0ae70081.tar.xz | |
Fix "read-tree -m A B" priming the cache-tree
In 456156d a shortcut to priming the index tree reference was
introduced, but the justification for it was completely bogus.
"read-tree -m A B" is to take the index (and the working tree)
that is largely based on (but does not have to match exactly) A
and update it to B, while carrying the local change that does
not overlap the difference between A and B, so there is no reason
to expect that the resulting index should match the tree B.
Noticed and test provided by Heiko Voigt.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-read-tree.c | 5 | ||||
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 82e25eaa0..4fbf5f82a 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -199,14 +199,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) * "-m ent" or "--reset ent" form), we can obtain a fully * valid cache-tree because the index must match exactly * what came from the tree. - * - * The same holds true if we are switching between two trees - * using read-tree -m A B. The index must match B after that. */ if (nr_trees == 1 && !opts.prefix) prime_cache_tree(&active_cache_tree, trees[0]); - else if (nr_trees == 2 && opts.merge) - prime_cache_tree(&active_cache_tree, trees[1]); if (write_cache(newfd, active_cache, active_nr) || commit_locked_index(&lock_file)) diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 271bc4e17..6e3b60110 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -392,4 +392,20 @@ test_expect_success \ git ls-files --stage | tee >treeMcheck.out && test_cmp treeM.out treeMcheck.out' +test_expect_success '-m references the correct modified tree' ' + echo >file-a && + echo >file-b && + git add file-a file-b && + git commit -a -m "test for correct modified tree" + git branch initial-mod && + echo b >file-b && + git commit -a -m "B" && + echo a >file-a && + git add file-a && + git ls-tree $(git write-tree) file-a >expect && + git read-tree -m HEAD initial-mod && + git ls-tree $(git write-tree) file-a >actual && + test_cmp expect actual +' + test_done |