summaryrefslogtreecommitdiff
path: root/t/t2200-add-update.sh
blob: eb1ced3c371ecaeab9d0dc14be888bf7df110483 (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
#!/bin/sh
 
test_description='git add -u with path limiting
 
This test creates a working tree state with three files:
 
  top (previously committed, modified)
  dir/sub (previously committed, modified)
  dir/other (untracked)
 
and issues a git add -u with path limiting on "dir" to add
only the updates to dir/sub.'
 
. ./test-lib.sh
 
test_expect_success setup '
	echo initial >check &&
	echo initial >top &&
	echo initial >foo &&
	mkdir dir1 dir2 &&
	echo initial >dir1/sub1 &&
	echo initial >dir1/sub2 &&
	echo initial >dir2/sub3 &&
	git add check dir1 dir2 top foo &&
	test_tick
	git-commit -m initial &&
 
	echo changed >check &&
	echo changed >top &&
	echo changed >dir2/sub3 &&
	rm -f dir1/sub1 &&
	echo other >dir2/other
'
 
test_expect_success update '
	git add -u dir1 dir2
'
 
test_expect_success 'update noticed a removal' '
	test "$(git-ls-files dir1/sub1)" = ""
'
 
test_expect_success 'update touched correct path' '
	test "$(git-diff-files --name-status dir2/sub3)" = ""
'
 
test_expect_success 'update did not touch other tracked files' '
	test "$(git-diff-files --name-status check)" = "M	check" &&
	test "$(git-diff-files --name-status top)" = "M	top"
'
 
test_expect_success 'update did not touch untracked files' '
	test "$(git-ls-files dir2/other)" = ""
'
 
test_expect_success 'cache tree has not been corrupted' '
 
	git ls-files -s |
	sed -e "s/ 0	/	/" >expect &&
	git ls-tree -r $(git write-tree) |
	sed -e "s/ blob / /" >current &&
	diff -u expect current
 
'
 
test_expect_success 'update from a subdirectory' '
	(
		cd dir1 &&
		echo more >sub2 &&
		git add -u sub2
	)
'
 
test_expect_success 'change gets noticed' '
 
	test "$(git diff-files --name-status dir1)" = ""
 
'
 
test_expect_success 'replace a file with a symlink' '
 
	rm foo &&
	ln -s top foo &&
	git add -u -- foo
 
'
 
test_done