revert: add "--strategy" option to choose merge strategy
[git/debian.git] / t / t4035-diff-quiet.sh
blobe747e842272df5935f863f78ccfc3b311f64228b
1 #!/bin/sh
3 test_description='Return value of diffs'
5 . ./test-lib.sh
7 test_expect_success 'setup' '
8 echo 1 >a &&
9 git add . &&
10 git commit -m first &&
11 echo 2 >b &&
12 git add . &&
13 git commit -a -m second
16 test_expect_success 'git diff-tree HEAD^ HEAD' '
17 git diff-tree --quiet HEAD^ HEAD >cnt
18 test $? = 1 && test $(wc -l <cnt) = 0
20 test_expect_success 'git diff-tree HEAD^ HEAD -- a' '
21 git diff-tree --quiet HEAD^ HEAD -- a >cnt
22 test $? = 0 && test $(wc -l <cnt) = 0
24 test_expect_success 'git diff-tree HEAD^ HEAD -- b' '
25 git diff-tree --quiet HEAD^ HEAD -- b >cnt
26 test $? = 1 && test $(wc -l <cnt) = 0
28 # this diff outputs one line: sha1 of the given head
29 test_expect_success 'echo HEAD | git diff-tree --stdin' '
30 echo $(git rev-parse HEAD) | git diff-tree --quiet --stdin >cnt
31 test $? = 1 && test $(wc -l <cnt) = 1
33 test_expect_success 'git diff-tree HEAD HEAD' '
34 git diff-tree --quiet HEAD HEAD >cnt
35 test $? = 0 && test $(wc -l <cnt) = 0
37 test_expect_success 'git diff-files' '
38 git diff-files --quiet >cnt
39 test $? = 0 && test $(wc -l <cnt) = 0
41 test_expect_success 'git diff-index --cached HEAD' '
42 git diff-index --quiet --cached HEAD >cnt
43 test $? = 0 && test $(wc -l <cnt) = 0
45 test_expect_success 'git diff-index --cached HEAD^' '
46 git diff-index --quiet --cached HEAD^ >cnt
47 test $? = 1 && test $(wc -l <cnt) = 0
49 test_expect_success 'git diff-index --cached HEAD^' '
50 echo text >>b &&
51 echo 3 >c &&
52 git add . && {
53 git diff-index --quiet --cached HEAD^ >cnt
54 test $? = 1 && test $(wc -l <cnt) = 0
57 test_expect_success 'git diff-tree -Stext HEAD^ HEAD -- b' '
58 git commit -m "text in b" && {
59 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt
60 test $? = 1 && test $(wc -l <cnt) = 0
63 test_expect_success 'git diff-tree -Snot-found HEAD^ HEAD -- b' '
64 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt
65 test $? = 0 && test $(wc -l <cnt) = 0
67 test_expect_success 'git diff-files' '
68 echo 3 >>c && {
69 git diff-files --quiet >cnt
70 test $? = 1 && test $(wc -l <cnt) = 0
73 test_expect_success 'git diff-index --cached HEAD' '
74 git update-index c && {
75 git diff-index --quiet --cached HEAD >cnt
76 test $? = 1 && test $(wc -l <cnt) = 0
80 test_done