Merge branch 'rs/object-id'

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index f22b6116806478a1f0378a77263490831c9673a2..364a537000bbbdd43047bd3f9c52c950a96dcbda 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1075,7 +1075,7 @@ test_expect_success 'git -c works with aliases of builtins' '
        test_cmp expect actual
 '
 
-test_expect_failure 'aliases can be CamelCased' '
+test_expect_success 'aliases can be CamelCased' '
        test_config alias.CamelCased "rev-parse HEAD" &&
        git CamelCased >out &&
        git rev-parse HEAD >expect &&
@@ -1552,4 +1552,10 @@ test_expect_success !MINGW '--show-origin blob ref' '
        test_cmp expect output
 '
 
+test_expect_success '--local requires a repo' '
+       # we expect 128 to ensure that we do not simply
+       # fail to find anything and return code "1"
+       test_expect_code 128 nongit git config --local foo.bar
+'
+
 test_done