]>
Commit | Line | Data |
---|---|---|
aab3b9a1 JH |
1 | #!/bin/sh |
2 | ||
3 | test_description='test multi-tree read-tree without merging' | |
4 | ||
334afbc7 JS |
5 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master |
6 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME | |
7 | ||
aab3b9a1 | 8 | . ./test-lib.sh |
ea5070c9 | 9 | . "$TEST_DIRECTORY"/lib-read-tree.sh |
aab3b9a1 JH |
10 | |
11 | test_expect_success setup ' | |
12 | echo one >a && | |
13 | git add a && | |
14 | git commit -m initial && | |
15 | git tag initial && | |
16 | echo two >b && | |
17 | git add b && | |
18 | git commit -m second && | |
19 | git checkout -b side initial && | |
20 | echo three >a && | |
21 | mkdir b && | |
22 | echo four >b/c && | |
23 | git add b/c && | |
24 | git commit -m third | |
25 | ' | |
26 | ||
27 | test_expect_success 'multi-read' ' | |
ea5070c9 | 28 | read_tree_must_succeed initial master side && |
0590ff26 | 29 | test_write_lines a b/c >expect && |
aab3b9a1 JH |
30 | git ls-files >actual && |
31 | test_cmp expect actual | |
32 | ' | |
33 | ||
34 | test_done | |
35 |