diff: reject unknown change class given to --diff-filter

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 0d0222ea2ace733ffe3fbfbdee58520abcd40e92..8b411eb66649f5a26c2f0e69a5c66cf3a97e30d3 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -52,7 +52,7 @@ test_expect_success setup '
 
 '
 
-test_expect_success 'remote information for the origin' '
+test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
 (
        cd test &&
        tokens_match origin "$(git remote)" &&
@@ -66,8 +66,6 @@ test_expect_success 'add another remote' '
        cd test &&
        git remote add -f second ../two &&
        tokens_match "origin second" "$(git remote)" &&
-       check_remote_track origin master side &&
-       check_remote_track second master side another &&
        check_tracking_branch second master side another &&
        git for-each-ref "--format=%(refname)" refs/remotes |
        sed -e "/^refs\/remotes\/origin\//d" \
@@ -77,6 +75,14 @@ test_expect_success 'add another remote' '
 )
 '
 
+test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
+(
+       cd test &&
+       check_remote_track origin master side &&
+       check_remote_track second master side another
+)
+'
+
 test_expect_success 'remote forces tracking branches' '
 (
        cd test &&
@@ -95,7 +101,7 @@ test_expect_success 'remove remote' '
 )
 '
 
-test_expect_success 'remove remote' '
+test_expect_success C_LOCALE_OUTPUT 'remove remote' '
 (
        cd test &&
        tokens_match origin "$(git remote)" &&
@@ -125,14 +131,14 @@ EOF
        } &&
        git tag footag &&
        git config --add remote.oops.fetch "+refs/*:refs/*" &&
-       git remote rm oops 2>actual1 &&
+       git remote remove oops 2>actual1 &&
        git branch foobranch &&
        git config --add remote.oops.fetch "+refs/*:refs/*" &&
        git remote rm oops 2>actual2 &&
        git branch -d foobranch &&
        git tag -d footag &&
-       test_cmp expect1 actual1 &&
-       test_cmp expect2 actual2
+       test_i18ncmp expect1 actual1 &&
+       test_i18ncmp expect2 actual2
 )
 '
 
@@ -192,7 +198,7 @@ test_expect_success 'show' '
         git config --add remote.two.push refs/heads/master:refs/heads/another &&
         git remote show origin two > output &&
         git branch -d rebase octopus &&
-        test_cmp expect output)
+        test_i18ncmp expect output)
 '
 
 cat > test/expect << EOF
@@ -217,7 +223,7 @@ test_expect_success 'show -n' '
         cd test &&
         git remote show -n origin > output &&
         mv ../one.unreachable ../one &&
-        test_cmp expect output)
+        test_i18ncmp expect output)
 '
 
 test_expect_success 'prune' '
@@ -255,7 +261,7 @@ EOF
 test_expect_success 'set-head --auto fails w/multiple HEADs' '
        (cd test &&
         test_must_fail git remote set-head --auto two >output 2>&1 &&
-       test_cmp expect output)
+       test_i18ncmp expect output)
 '
 
 cat >test/expect <<EOF
@@ -285,7 +291,7 @@ test_expect_success 'prune --dry-run' '
         test_must_fail git rev-parse refs/remotes/origin/side &&
        (cd ../one &&
         git branch -m side side2) &&
-        test_cmp expect output)
+        test_i18ncmp expect output)
 '
 
 test_expect_success 'add --mirror && prune' '
@@ -631,6 +637,37 @@ test_expect_success 'rename a remote' '
 
 '
 
+test_expect_success 'rename does not update a non-default fetch refspec' '
+
+       git clone one four.one &&
+       (cd four.one &&
+        git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
+        git remote rename origin upstream &&
+        test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
+        git rev-parse -q origin/master)
+
+'
+
+test_expect_success 'rename a remote with name part of fetch spec' '
+
+       git clone one four.two &&
+       (cd four.two &&
+        git remote rename origin remote &&
+        git remote rename remote upstream &&
+        test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*")
+
+'
+
+test_expect_success 'rename a remote with name prefix of other remote' '
+
+       git clone one four.three &&
+       (cd four.three &&
+        git remote add o git://example.com/repo.git &&
+        git remote rename o upstream &&
+        test "$(git rev-parse origin/master)" = "$(git rev-parse master)")
+
+'
+
 cat > remotes_origin << EOF
 URL: $(pwd)/one
 Push: refs/heads/master:refs/heads/upstream
@@ -641,7 +678,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
        git clone one five &&
        origin_url=$(pwd)/one &&
        (cd five &&
-        git remote rm origin &&
+        git remote remove origin &&
         mkdir -p .git/remotes &&
         cat ../remotes_origin > .git/remotes/origin &&
         git remote rename origin origin &&
@@ -674,7 +711,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
                cd seven &&
                git remote prune origin
        ) >err 2>&1 &&
-       grep "has become dangling" err &&
+       test_i18ngrep "has become dangling" err &&
 
        : And the dangling symref will not cause other annoying errors &&
        (
@@ -966,4 +1003,26 @@ test_expect_success 'remote set-url --delete baz' '
        cmp expect actual
 '
 
+test_expect_success 'extra args: setup' '
+       # add a dummy origin so that this does not trigger failure
+       git remote add origin .
+'
+
+test_extra_arg () {
+       test_expect_success "extra args: $*" "
+               test_must_fail git remote $* bogus_extra_arg 2>actual &&
+               grep '^usage:' actual
+       "
+}
+
+test_extra_arg add nick url
+test_extra_arg rename origin newname
+test_extra_arg remove origin
+test_extra_arg set-head origin master
+# set-branches takes any number of args
+test_extra_arg set-url origin newurl oldurl
+# show takes any number of args
+# prune takes any number of args
+# update takes any number of args
+
 test_done