Squashed 'third_party/git/' content from commit cb71568594
git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
This commit is contained in:
commit
1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
32
t/t1008-read-tree-overlay.sh
Executable file
32
t/t1008-read-tree-overlay.sh
Executable file
|
|
@ -0,0 +1,32 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='test multi-tree read-tree without merging'
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-read-tree.sh
|
||||
|
||||
test_expect_success setup '
|
||||
echo one >a &&
|
||||
git add a &&
|
||||
git commit -m initial &&
|
||||
git tag initial &&
|
||||
echo two >b &&
|
||||
git add b &&
|
||||
git commit -m second &&
|
||||
git checkout -b side initial &&
|
||||
echo three >a &&
|
||||
mkdir b &&
|
||||
echo four >b/c &&
|
||||
git add b/c &&
|
||||
git commit -m third
|
||||
'
|
||||
|
||||
test_expect_success 'multi-read' '
|
||||
read_tree_must_succeed initial master side &&
|
||||
test_write_lines a b/c >expect &&
|
||||
git ls-files >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue