diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-14 09:34:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-14 09:34:23 -0700 |
| commit | c9a9766328763a776201b4b11263652b66ff9465 (patch) | |
| tree | b2444ce4dc11a84e640e8343e2ce141a23a0bf35 /t | |
| parent | c7d1d1b1329a104d2f7fe6307da4344288bc8e01 (diff) | |
| parent | 037c43c68e220739e690540de89a6d5835fefe73 (diff) | |
| download | git-c9a9766328763a776201b4b11263652b66ff9465.tar.gz git-c9a9766328763a776201b4b11263652b66ff9465.tar.xz | |
Merge branch 'jc/read-tree-cache-tree-fix'
* jc/read-tree-cache-tree-fix:
Fix "read-tree -m A B" priming the cache-tree
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 6327d205c..0c562bb82 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -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 |