diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:05:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:05:22 -0700 |
| commit | 1c6e3514d093377fec5e30aa02a119187cf743f2 (patch) | |
| tree | fe3865b32c4690dce137a173d86f3876578cf02c /t | |
| parent | 6e1a7510b1dd830de69e174e409a40eb580c3ba7 (diff) | |
| parent | 73546c085d49694c5e54b421f80bde6bc25006fb (diff) | |
| download | git-1c6e3514d093377fec5e30aa02a119187cf743f2.tar.gz git-1c6e3514d093377fec5e30aa02a119187cf743f2.tar.xz | |
Merge branch 'jk/maint-config-alias-fix' into maint
* 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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1300-repo-config.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 53fb8228c..3db56267e 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 |