blob: 4c50ed955eb18da1a60dd9d635f3c32d081cfb76 [file] [log] [blame]
Junio C Hamanoaab3b9a2009-03-12 00:02:12 -07001#!/bin/sh
2
3test_description='test multi-tree read-tree without merging'
4
5. ./test-lib.sh
Jens Lehmannea5070c2011-05-25 22:10:41 +02006. "$TEST_DIRECTORY"/lib-read-tree.sh
Junio C Hamanoaab3b9a2009-03-12 00:02:12 -07007
8test_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
22'
23
24test_expect_success 'multi-read' '
Jens Lehmannea5070c2011-05-25 22:10:41 +020025 read_tree_must_succeed initial master side &&
Junio C Hamanoaab3b9a2009-03-12 00:02:12 -070026 (echo a; echo b/c) >expect &&
27 git ls-files >actual &&
28 test_cmp expect actual
29'
30
31test_done
32