summaryrefslogtreecommitdiff
path: root/t/t1004-read-tree-m-u-wf.sh
blob: 4f664f6adfb6153058848d3a3016c34e08b9425c (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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
#!/bin/sh
 
test_description='read-tree -m -u checks working tree files'
 
. ./test-lib.sh
 
# two-tree test
 
test_expect_success 'two-way setup' '
 
	mkdir subdir &&
	echo >file1 file one &&
	echo >file2 file two &&
	echo >subdir/file1 file one in subdirectory &&
	echo >subdir/file2 file two in subdirectory &&
	git update-index --add file1 file2 subdir/file1 subdir/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 subdir/file2 &&
	git update-index --remove file2 subdir/file2 &&
	git commit -a -m "master removes file2 and subdir/file2"
'
 
test_expect_success 'two-way not clobbering' '
 
	echo >file2 master creates untracked file2 &&
	echo >subdir/file2 master creates untracked subdir/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
'
 
echo file2 >.gitignore
 
test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
 
	if err=`git read-tree -m --exclude-per-directory=.gitignore master side 2>&1`
	then
		echo should have complained
		false
	else
		echo "happy to see $err"
	fi
'
 
test_expect_success 'two-way with incorrect --exclude-per-directory (2)' '
 
	if err=`git read-tree -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1`
	then
		echo should have complained
		false
	else
		echo "happy to see $err"
	fi
'
 
test_expect_success 'two-way clobbering a ignored file' '
 
	git read-tree -m -u --exclude-per-directory=.gitignore master side
'
 
rm -f .gitignore
 
# three-tree test
 
test_expect_success 'three-way not complaining on an untracked path in both' '
 
	rm -f file2 subdir/file2 &&
	git checkout side &&
	echo >file3 file three &&
	echo >subdir/file3 file three &&
	git update-index --add file3 subdir/file3 &&
	git commit -a -m "side adds file3 and removes file2" &&
 
	git checkout master &&
	echo >file2 file two is untracked on the master side &&
	echo >subdir/file2 file two is untracked on the master side &&
 
	git-read-tree -m -u branch-point master side
'
 
test_expect_success 'three-way not cloberring a working tree file' '
 
	git reset --hard &&
	rm -f file2 subdir/file2 file3 subdir/file3 &&
	git checkout master &&
	echo >file3 file three created in master, untracked &&
	echo >subdir/file3 file three created in master, untracked &&
	if err=`git read-tree -m -u branch-point master side 2>&1`
	then
		echo should have complained
		false
	else
		echo "happy to see $err"
	fi
'
 
echo >.gitignore file3
 
test_expect_success 'three-way not complaining on an untracked file' '
 
	git reset --hard &&
	rm -f file2 subdir/file2 file3 subdir/file3 &&
	git checkout master &&
	echo >file3 file three created in master, untracked &&
	echo >subdir/file3 file three created in master, untracked &&
 
	git read-tree -m -u --exclude-per-directory=.gitignore branch-point master side
'
 
test_done