Add Code Compare v2.80.4 as a merge / diff tool for Windows
[alt-git.git] / t / t1008-read-tree-overlay.sh
blob4c50ed955eb18da1a60dd9d635f3c32d081cfb76
1 #!/bin/sh
3 test_description='test multi-tree read-tree without merging'
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-read-tree.sh
8 test_expect_success setup '
9 echo one >a &&
10 git add a &&
11 git commit -m initial &&
12 git tag initial &&
13 echo two >b &&
14 git add b &&
15 git commit -m second &&
16 git checkout -b side initial &&
17 echo three >a &&
18 mkdir b &&
19 echo four >b/c &&
20 git add b/c &&
21 git commit -m third
24 test_expect_success 'multi-read' '
25 read_tree_must_succeed initial master side &&
26 (echo a; echo b/c) >expect &&
27 git ls-files >actual &&
28 test_cmp expect actual
31 test_done