t7006: demonstrate a problem with aliases in subdirectories

When expanding aliases, the git_dir is set during the alias expansion (by virtue of running setup_git_directory_gently()). This git_dir may be relative to the current working directory, and indeed often is simply ".git/". When the alias expands to a shell command, we restore the original working directory, though, yet we do not reset git_dir. As a consequence, subsequent read_early_config() runs will mistake the git_dir to be populated properly and not find the correct config. Demonstrate this problem by adding a test case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jun 14, 2017 at 13:35 UTC 3f9c5dfb7118256747de5efbaa4b5cd3f0e02331
1 file changed +11
t/t7006-pager.sh
+11
@@ -391,6 +391,17 @@ test_expect_success TTY 'core.pager in repo config works and retains cwd' '
391 )
392 '
393
394 +test_expect_failure TTY 'core.pager is found via alias in subdirectory' '
395 + sane_unset GIT_PAGER &&
396 + test_config core.pager "cat >via-alias" &&
397 + (
398 + cd sub &&
399 + rm -f via-alias &&
400 + test_terminal git -c alias.r="-p rev-parse" r HEAD &&
401 + test_path_is_file via-alias
402 + )
403 +'
404 +
405 test_doesnt_paginate expect_failure test_must_fail 'git -p nonsense'
406
407 test_pager_choices 'git shortlog'