git-am: Mention --abort in usage string part of OPTIONS_SPEC

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
old mode 100644 (file)
new mode 100755 (executable)
index dc7a47b..833d6cb
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -33,28 +33,28 @@ 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 funcname=java" >.gitattributes &&
-       git diff Beer.java Beer-correct.java |
+       echo "*.java diff=java" >.gitattributes &&
+       git diff --no-index Beer.java Beer-correct.java |
        grep "^@@.*@@ public static void main("
 '
 
-git config funcname.java '!static
+git config diff.java.funcname '!static
 !String
 [^     ].*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.functionnameregexp "!static" &&
-       ! git diff Beer.java Beer-correct.java
+       git config diff.java.funcname "!static" &&
+       test_must_fail git diff --no-index Beer.java Beer-correct.java
 '
 
 test_done