]>
Commit | Line | Data |
---|---|---|
b75aea8f JH |
1 | #!/bin/sh |
2 | ||
3 | test_description='giving ignored paths to git add' | |
4 | ||
aecb85bd | 5 | TEST_PASSES_SANITIZE_LEAK=true |
b75aea8f JH |
6 | . ./test-lib.sh |
7 | ||
8 | test_expect_success setup ' | |
9 | mkdir sub dir dir/sub && | |
10 | echo sub >.gitignore && | |
11 | echo ign >>.gitignore && | |
12 | for p in . sub dir dir/sub | |
13 | do | |
14 | >"$p/ign" && | |
15 | >"$p/file" || exit 1 | |
16 | done | |
17 | ' | |
18 | ||
19 | for i in file dir/file dir 'd*' | |
20 | do | |
21 | test_expect_success "no complaints for unignored $i" ' | |
22 | rm -f .git/index && | |
23 | git add "$i" && | |
24 | git ls-files "$i" >out && | |
25 | test -s out | |
26 | ' | |
27 | done | |
28 | ||
29 | for i in ign dir/ign dir/sub dir/sub/*ign sub/file sub sub/* | |
30 | do | |
31 | test_expect_success "complaints for ignored $i" ' | |
32 | rm -f .git/index && | |
33 | test_must_fail git add "$i" 2>err && | |
34 | git ls-files "$i" >out && | |
ec10b018 | 35 | test_must_be_empty out |
439fb829 ÆAB |
36 | ' |
37 | ||
f2c8c800 | 38 | test_expect_success "complaints for ignored $i output" ' |
6789275d | 39 | test_grep -e "Use -f if" err |
b75aea8f JH |
40 | ' |
41 | ||
42 | test_expect_success "complaints for ignored $i with unignored file" ' | |
43 | rm -f .git/index && | |
44 | test_must_fail git add "$i" file 2>err && | |
45 | git ls-files "$i" >out && | |
ec10b018 | 46 | test_must_be_empty out |
439fb829 | 47 | ' |
f2c8c800 | 48 | test_expect_success "complaints for ignored $i with unignored file output" ' |
6789275d | 49 | test_grep -e "Use -f if" err |
b75aea8f JH |
50 | ' |
51 | done | |
52 | ||
53 | for i in sub sub/* | |
54 | do | |
55 | test_expect_success "complaints for ignored $i in dir" ' | |
56 | rm -f .git/index && | |
57 | ( | |
58 | cd dir && | |
59 | test_must_fail git add "$i" 2>err && | |
60 | git ls-files "$i" >out && | |
ec10b018 | 61 | test_must_be_empty out |
439fb829 ÆAB |
62 | ) |
63 | ' | |
64 | ||
f2c8c800 | 65 | test_expect_success "complaints for ignored $i in dir output" ' |
439fb829 ÆAB |
66 | ( |
67 | cd dir && | |
6789275d | 68 | test_grep -e "Use -f if" err |
b75aea8f JH |
69 | ) |
70 | ' | |
71 | done | |
72 | ||
73 | for i in ign file | |
74 | do | |
75 | test_expect_success "complaints for ignored $i in sub" ' | |
76 | rm -f .git/index && | |
77 | ( | |
78 | cd sub && | |
79 | test_must_fail git add "$i" 2>err && | |
80 | git ls-files "$i" >out && | |
ec10b018 | 81 | test_must_be_empty out |
439fb829 ÆAB |
82 | ) |
83 | ' | |
84 | ||
f2c8c800 | 85 | test_expect_success "complaints for ignored $i in sub output" ' |
439fb829 ÆAB |
86 | ( |
87 | cd sub && | |
6789275d | 88 | test_grep -e "Use -f if" err |
b75aea8f JH |
89 | ) |
90 | ' | |
91 | done | |
92 | ||
93 | test_done |