diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-20 00:41:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-20 00:41:30 +0300 |
| commit | 25a294e44db1c479e8abe2449f71279e6511ea32 (patch) | |
| tree | b77ff79cf66660d1db638d02135e982f1bf01999 /t | |
| parent | f9610bcae907a38636174a688c1aa89c63cc9c1a (diff) | |
| parent | d95138e695d99d32dcad528a2a7974f434c51e79 (diff) | |
Merge branch 'nd/export-worktree' into maint
Running an aliased command from a subdirectory when the .git thing
in the working tree is a gitfile pointing elsewhere did not work.
* nd/export-worktree:
setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0002-gitfile.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index 37e9396e5d..9393322c3e 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -99,4 +99,21 @@ test_expect_success 'check rev-list' ' test "$SHA" = "$(git rev-list HEAD)" ' +test_expect_success 'setup_git_dir twice in subdir' ' + git init sgd && + ( + cd sgd && + git config alias.lsfi ls-files && + mv .git .realgit && + echo "gitdir: .realgit" >.git && + mkdir subdir && + cd subdir && + >foo && + git add foo && + git lsfi >actual && + echo foo >expected && + test_cmp expected actual + ) +' + test_done |