Merge branch 'js/alias-case-sensitivity' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:03:38 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:03:38 +0000 (15:03 -0700)
A recent update broke an alias that contained an uppercase letter.

* js/alias-case-sensitivity:
alias: compare alias name *case-insensitively*
t1300: demonstrate that CamelCased aliases regressed

1  2 
t/t1300-repo-config.sh
diff --combined t/t1300-repo-config.sh
index a37ef0422212eafdae4b4c0fae9e28d4a183117f,23312bee286ab89e24196b150d99bb3283d5d094..364a537000bbbdd43047bd3f9c52c950a96dcbda
@@@ -1075,6 -1075,13 +1075,13 @@@ test_expect_success 'git -c works with 
        test_cmp expect actual
  '
  
+ test_expect_success 'aliases can be CamelCased' '
+       test_config alias.CamelCased "rev-parse HEAD" &&
+       git CamelCased >out &&
+       git rev-parse HEAD >expect &&
+       test_cmp expect out
+ '
  test_expect_success 'git -c does not split values on equals' '
        echo "value with = in it" >expect &&
        git -c core.foo="value with = in it" config core.foo >actual &&
@@@ -1545,10 -1552,4 +1552,10 @@@ test_expect_success !MINGW '--show-orig
        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