Git fork
1#!/bin/sh
2
3test_description='test multi-tree read-tree without merging'
4
5GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
8. ./test-lib.sh
9. "$TEST_DIRECTORY"/lib-read-tree.sh
10
11test_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
27test_expect_success 'multi-read' '
28 read_tree_must_succeed initial main side &&
29 test_write_lines a b/c >expect &&
30 git ls-files >actual &&
31 test_cmp expect actual
32'
33
34test_done
35