diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 20:01:14 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 20:01:14 +0200 |
commit | a3f4eb1b40457d85ab63168b621e71eaf73bb3c4 (patch) | |
tree | 820a0708317f463df97523b117806be63cb1e709 /t | |
parent | Merge branch 'ee/clean-remove-dirs' (diff) | |
parent | setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR (diff) | |
download | git-a3f4eb1b40457d85ab63168b621e71eaf73bb3c4.tar.xz git-a3f4eb1b40457d85ab63168b621e71eaf73bb3c4.zip |
Merge branch 'nd/export-worktree'
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 |