summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 03:19:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-31 03:19:14 (GMT)
commit1f9a980636d39c08c1cf1c13a6e6584d9d039e0e (patch)
tree97f906828fd6ad4166101e7e5d86a7a4b9671079 /t
parentfb674d767180354d9ad3e69f1d41bee98df6bfe9 (diff)
parent73546c085d49694c5e54b421f80bde6bc25006fb (diff)
downloadgit-1f9a980636d39c08c1cf1c13a6e6584d9d039e0e.zip
git-1f9a980636d39c08c1cf1c13a6e6584d9d039e0e.tar.gz
git-1f9a980636d39c08c1cf1c13a6e6584d9d039e0e.tar.bz2
Merge branch 'jk/maint-config-alias-fix'
* jk/maint-config-alias-fix: handle_options(): do not miscount how many arguments were used config: always parse GIT_CONFIG_PARAMETERS during git_config git_config: don't peek at global config_parameters config: make environment parsing routines static Conflicts: config.c
Diffstat (limited to 't')
-rwxr-xr-xt/t1300-repo-config.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 53fb822..3db5626 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -897,4 +897,11 @@ test_expect_success 'key sanity-checking' '
git config foo."ba =z".bar false
'
+test_expect_success 'git -c works with aliases of builtins' '
+ git config alias.checkconfig "-c foo.check=bar config foo.check" &&
+ echo bar >expect &&
+ git checkconfig >actual &&
+ test_cmp expect actual
+'
+
test_done