Merge branch 'jk/send-pack-many-refspecs'
[git/mingw.git] / t / t2200-add-update.sh
blobe16b15d3e5784eb3c6423318142cb91fe3a58601
1 #!/bin/sh
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)
9 dir/other (untracked)
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-lib.sh
19 test_expect_success setup '
20 echo initial >check &&
21 echo initial >top &&
22 echo initial >foo &&
23 mkdir dir1 dir2 &&
24 echo initial >dir1/sub1 &&
25 echo initial >dir1/sub2 &&
26 echo initial >dir2/sub3 &&
27 git add check dir1 dir2 top foo &&
28 test_tick &&
29 git commit -m initial &&
31 echo changed >check &&
32 echo changed >top &&
33 echo changed >dir2/sub3 &&
34 rm -f dir1/sub1 &&
35 echo other >dir2/other
38 test_expect_success update '
39 git add -u dir1 dir2
42 test_expect_success 'update noticed a removal' '
43 test "$(git ls-files dir1/sub1)" = ""
46 test_expect_success 'update touched correct path' '
47 test "$(git diff-files --name-status dir2/sub3)" = ""
50 test_expect_success 'update did not touch other tracked files' '
51 test "$(git diff-files --name-status check)" = "M check" &&
52 test "$(git diff-files --name-status top)" = "M top"
55 test_expect_success 'update did not touch untracked files' '
56 test "$(git ls-files dir2/other)" = ""
59 test_expect_success 'cache tree has not been corrupted' '
61 git ls-files -s |
62 sed -e "s/ 0 / /" >expect &&
63 git ls-tree -r $(git write-tree) |
64 sed -e "s/ blob / /" >current &&
65 test_cmp expect current
69 test_expect_success 'update from a subdirectory' '
71 cd dir1 &&
72 echo more >sub2 &&
73 git add -u sub2
77 test_expect_success 'change gets noticed' '
79 test "$(git diff-files --name-status dir1)" = ""
83 test_expect_success 'non-qualified update in subdir updates from the root' '
85 cd dir1 &&
86 echo even more >>sub2 &&
87 git add -u
88 ) &&
89 : >expect &&
90 git diff-files --name-only >actual &&
91 test_cmp expect actual
94 test_expect_success 'replace a file with a symlink' '
96 rm foo &&
97 test_ln_s_add top foo
101 test_expect_success 'add everything changed' '
103 git add -u &&
104 test -z "$(git diff-files)"
108 test_expect_success 'touch and then add -u' '
110 touch check &&
111 git add -u &&
112 test -z "$(git diff-files)"
116 test_expect_success 'touch and then add explicitly' '
118 touch check &&
119 git add check &&
120 test -z "$(git diff-files)"
124 test_expect_success 'add -n -u should not add but just report' '
127 echo "add '\''check'\''" &&
128 echo "remove '\''top'\''"
129 ) >expect &&
130 before=$(git ls-files -s check top) &&
131 echo changed >>check &&
132 rm -f top &&
133 git add -n -u >actual &&
134 after=$(git ls-files -s check top) &&
136 test "$before" = "$after" &&
137 test_i18ncmp expect actual
141 test_expect_success 'add -u resolves unmerged paths' '
142 git reset --hard &&
143 one=$(echo 1 | git hash-object -w --stdin) &&
144 two=$(echo 2 | git hash-object -w --stdin) &&
145 three=$(echo 3 | git hash-object -w --stdin) &&
147 for path in path1 path2
149 echo "100644 $one 1 $path"
150 echo "100644 $two 2 $path"
151 echo "100644 $three 3 $path"
152 done
153 echo "100644 $one 1 path3"
154 echo "100644 $one 1 path4"
155 echo "100644 $one 3 path5"
156 echo "100644 $one 3 path6"
158 git update-index --index-info &&
159 echo 3 >path1 &&
160 echo 2 >path3 &&
161 echo 2 >path5 &&
163 # Fail to explicitly resolve removed paths with "git add"
164 test_must_fail git add --no-all path4 &&
165 test_must_fail git add --no-all path6 &&
167 # "add -u" should notice removals no matter what stages
168 # the index entries are in.
169 git add -u &&
170 git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
172 echo "100644 $three 0 path1"
173 echo "100644 $two 0 path3"
174 echo "100644 $two 0 path5"
175 } >expect &&
176 test_cmp expect actual
179 test_expect_success '"add -u non-existent" should fail' '
180 test_must_fail git add -u non-existent &&
181 ! (git ls-files | grep "non-existent")
184 test_done