blob: 018fbea450b3481bea2586769de7418dea929e29 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
#!/bin/sh
test_description='read-tree -m -u checks working tree files'
. ./test-lib.sh
# two-tree test
test_expect_success 'two-way setup' '
echo >file1 file one &&
echo >file2 file two &&
git update-index --add file1 file2 &&
git commit -m initial &&
git branch side &&
git tag -f branch-point &&
echo file2 is not tracked on the master anymore &&
rm -f file2 &&
git update-index --remove file2 &&
git commit -a -m "master removes file2"
'
test_expect_success 'two-way not clobbering' '
echo >file2 master creates untracked file2 &&
if err=`git read-tree -m -u master side 2>&1`
then
echo should have complained
false
else
echo "happy to see $err"
fi
'
# three-tree test
test_expect_success 'three-way not complaining' '
rm -f file2 &&
git checkout side &&
echo >file3 file three &&
git update-index --add file3 &&
git commit -a -m "side adds file3" &&
git checkout master &&
echo >file2 file two is untracked on the master side &&
git-read-tree -m -u branch-point master side
'
test_done
|
