mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'jc/read-tree-cache-tree-fix'
* jc/read-tree-cache-tree-fix: Fix "read-tree -m A B" priming the cache-tree
This commit is contained in:
commit
c9a9766328
|
@ -219,14 +219,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))
|
||||
|
|
|
@ -390,4 +390,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
|
||||
|
|
Loading…
Reference in a new issue