changed added/conflicted checking order
[git/mingw/4msysgit/wingit-dll.git] / t / t2202-add-addremove.sh
blob6a8151064c8256bd03a90460eb1bd6970428f2f0
1 #!/bin/sh
3 test_description='git add --all'
5 . ./test-lib.sh
7 test_expect_success setup '
9 echo .gitignore
10 echo will-remove
11 ) >expect &&
13 echo actual
14 echo expect
15 echo ignored
16 ) >.gitignore &&
17 >will-remove &&
18 git add --all &&
19 test_tick &&
20 git commit -m initial &&
21 git ls-files >actual &&
22 test_cmp expect actual
25 test_expect_success 'git add --all' '
27 echo .gitignore
28 echo not-ignored
29 echo "M .gitignore"
30 echo "A not-ignored"
31 echo "D will-remove"
32 ) >expect &&
33 >ignored &&
34 >not-ignored &&
35 echo modification >>.gitignore &&
36 rm -f will-remove &&
37 git add --all &&
38 git update-index --refresh &&
39 git ls-files >actual &&
40 git diff-index --name-status --cached HEAD >>actual &&
41 test_cmp expect actual
44 test_done