diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:40 (GMT) |
| commit | 1c3d87cf5594cc7e57d71c7b2d99dd4982285951 (patch) | |
| tree | 9a461af87a2e6c7191cd158093b37f0eea6f0c2a /t | |
| parent | 9bca0e5513579386384c064c5cdc45980b6774df (diff) | |
| parent | a9bcf6586d1a4888aea91553d73cda20494b8335 (diff) | |
| download | git-1c3d87cf5594cc7e57d71c7b2d99dd4982285951.zip git-1c3d87cf5594cc7e57d71c7b2d99dd4982285951.tar.gz git-1c3d87cf5594cc7e57d71c7b2d99dd4982285951.tar.bz2 | |
Merge branch 'js/alias-early-config'
The code to pick up and execute command alias definition from the
configuration used to switch to the top of the working tree and
then come back when the expanded alias was executed, which was
unnecessarilyl complex. Attempt to simplify the logic by using the
early-config mechanism that does not chdir around.
* js/alias-early-config:
alias: use the early config machinery to expand aliases
t7006: demonstrate a problem with aliases in subdirectories
t1308: relax the test verifying that empty alias values are disallowed
help: use early config when autocorrecting aliases
config: report correct line number upon error
discover_git_directory(): avoid setting invalid git_dir
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1300-repo-config.sh | 6 | ||||
| -rwxr-xr-x | t/t1308-config-set.sh | 4 | ||||
| -rwxr-xr-x | t/t7006-pager.sh | 11 |
3 files changed, 20 insertions, 1 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 13b7851..a37ef04 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -703,6 +703,12 @@ test_expect_success 'invalid unit' ' test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual ' +test_expect_success 'line number is reported correctly' ' + printf "[bool]\n\tvar\n" >invalid && + test_must_fail git config -f invalid --path bool.var 2>actual && + test_i18ngrep "line 2" actual +' + test_expect_success 'invalid stdin config' ' echo "[broken" | test_must_fail git config --list --file - >output 2>&1 && test_i18ngrep "bad config line 1 in standard input" output diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh index e495a61..bafed5c 100755 --- a/t/t1308-config-set.sh +++ b/t/t1308-config-set.sh @@ -226,7 +226,9 @@ test_expect_success 'check line errors for malformed values' ' br EOF test_expect_code 128 git br 2>result && - test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result + test_i18ngrep "missing value for .alias\.br" result && + test_i18ngrep "fatal: .*\.git/config" result && + test_i18ngrep "fatal: .*line 2" result ' test_expect_success 'error on modifying repo config without repo' ' diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 4f3794d..20b4d83 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -391,6 +391,17 @@ test_expect_success TTY 'core.pager in repo config works and retains cwd' ' ) ' +test_expect_success TTY 'core.pager is found via alias in subdirectory' ' + sane_unset GIT_PAGER && + test_config core.pager "cat >via-alias" && + ( + cd sub && + rm -f via-alias && + test_terminal git -c alias.r="-p rev-parse" r HEAD && + test_path_is_file via-alias + ) +' + test_doesnt_paginate expect_failure test_must_fail 'git -p nonsense' test_pager_choices 'git shortlog' |