3 test_description
='git add -u
5 This test creates a working tree state with three files:
7 top (previously committed, modified)
8 dir/sub (previously committed, modified)
11 and issues a git add -u with path limiting on "dir" to add
12 only the updates to dir/sub.
14 Also tested are "git add -u" without limiting, and "git add -u"
15 without contents changes, and other conditions'
17 TEST_PASSES_SANITIZE_LEAK
=true
20 test_expect_success setup
'
21 echo initial >check &&
25 echo initial >dir1/sub1 &&
26 echo initial >dir1/sub2 &&
27 echo initial >dir2/sub3 &&
28 git add check dir1 dir2 top foo &&
30 git commit -m initial &&
32 echo changed >check &&
34 echo changed >dir2/sub3 &&
36 echo other >dir2/other
39 test_expect_success update
'
43 test_expect_success
'update noticed a removal' '
44 test "$(git ls-files dir1/sub1)" = ""
47 test_expect_success
'update touched correct path' '
48 test "$(git diff-files --name-status dir2/sub3)" = ""
51 test_expect_success
'update did not touch other tracked files' '
52 test "$(git diff-files --name-status check)" = "M check" &&
53 test "$(git diff-files --name-status top)" = "M top"
56 test_expect_success
'update did not touch untracked files' '
57 test "$(git ls-files dir2/other)" = ""
60 test_expect_success
'cache tree has not been corrupted' '
63 sed -e "s/ 0 / /" >expect &&
64 git ls-tree -r $(git write-tree) |
65 sed -e "s/ blob / /" >current &&
66 test_cmp expect current
70 test_expect_success
'update from a subdirectory' '
78 test_expect_success
'change gets noticed' '
80 test "$(git diff-files --name-status dir1)" = ""
84 test_expect_success
'non-qualified update in subdir updates from the root' '
87 echo even more >>sub2 &&
88 git --literal-pathspecs add -u &&
89 echo even more >>sub2 &&
92 git diff-files --name-only >actual &&
93 test_must_be_empty actual
96 test_expect_success
'replace a file with a symlink' '
103 test_expect_success
'add everything changed' '
106 test -z "$(git diff-files)"
110 test_expect_success
'touch and then add -u' '
114 test -z "$(git diff-files)"
118 test_expect_success
'touch and then add explicitly' '
122 test -z "$(git diff-files)"
126 test_expect_success
'add -n -u should not add but just report' '
129 echo "add '\''check'\''" &&
130 echo "remove '\''top'\''"
132 before=$(git ls-files -s check top) &&
133 git count-objects -v >objects_before &&
134 echo changed >>check &&
136 git add -n -u >actual &&
137 after=$(git ls-files -s check top) &&
138 git count-objects -v >objects_after &&
140 test "$before" = "$after" &&
141 test_cmp objects_before objects_after &&
142 test_cmp expect actual
146 test_expect_success
'add -u resolves unmerged paths' '
148 one=$(echo 1 | git hash-object -w --stdin) &&
149 two=$(echo 2 | git hash-object -w --stdin) &&
150 three=$(echo 3 | git hash-object -w --stdin) &&
152 for path in path1 path2
154 echo "100644 $one 1 $path" &&
155 echo "100644 $two 2 $path" &&
156 echo "100644 $three 3 $path" || return 1
158 echo "100644 $one 1 path3" &&
159 echo "100644 $one 1 path4" &&
160 echo "100644 $one 3 path5" &&
161 echo "100644 $one 3 path6"
163 git update-index --index-info &&
168 # Fail to explicitly resolve removed paths with "git add"
169 test_must_fail git add --no-all path4 &&
170 test_must_fail git add --no-all path6 &&
172 # "add -u" should notice removals no matter what stages
173 # the index entries are in.
175 git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
177 echo "100644 $three 0 path1" &&
178 echo "100644 $two 0 path3" &&
179 echo "100644 $two 0 path5"
181 test_cmp expect actual
184 test_expect_success
'"add -u non-existent" should fail' '
185 test_must_fail git add -u non-existent &&
186 git ls-files >actual &&
187 ! grep "non-existent" actual