diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-24 05:28:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-24 07:01:56 (GMT) |
| commit | 3af828634fa5bdbca1b2061a81df8b3fa73b0d34 (patch) | |
| tree | f4d4a50e8c1686b3ecd796a09f98cc6ca13bc907 /t/t4018-diff-funcname.sh | |
| parent | 998b912927281a871e8d379e2b3a4385c775c4fe (diff) | |
| download | git-3af828634fa5bdbca1b2061a81df8b3fa73b0d34.zip git-3af828634fa5bdbca1b2061a81df8b3fa73b0d34.tar.gz git-3af828634fa5bdbca1b2061a81df8b3fa73b0d34.tar.bz2 | |
tests: do not use implicit "git diff --no-index"
As a general principle, we should not use "git diff" to validate the
results of what git command that is being tested has done. We would not
know if we are testing the command in question, or locating a bug in the
cute hack of "git diff --no-index".
Rather use test_cmp for that purpose.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4018-diff-funcname.sh')
| -rwxr-xr-x | t/t4018-diff-funcname.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index f9db81d..6d3ef6c 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -33,13 +33,13 @@ EOF sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java test_expect_success 'default behaviour' ' - git diff Beer.java Beer-correct.java | + git diff --no-index Beer.java Beer-correct.java | grep "^@@.*@@ public class Beer" ' test_expect_success 'preset java pattern' ' echo "*.java diff=java" >.gitattributes && - git diff Beer.java Beer-correct.java | + git diff --no-index Beer.java Beer-correct.java | grep "^@@.*@@ public static void main(" ' @@ -48,13 +48,13 @@ git config diff.java.funcname '!static [^ ].*s.*' test_expect_success 'custom pattern' ' - git diff Beer.java Beer-correct.java | + git diff --no-index Beer.java Beer-correct.java | grep "^@@.*@@ int special;$" ' test_expect_success 'last regexp must not be negated' ' git config diff.java.funcname "!static" && - ! git diff Beer.java Beer-correct.java + ! git diff --no-index Beer.java Beer-correct.java ' test_done |