diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:40 -0800 |
| commit | 9c17ccaa49d00a87cefe0ef18a371e4f45e968fc (patch) | |
| tree | 7298abc8c0eb2d71be9cfda6a324f3d254ae3a00 /t | |
| parent | 8834ea375a404a6c79a6d8cd8cbc9954c6f2847d (diff) | |
| parent | 17f1365dbce9aa00cab3f196e7fa7138d9081eef (diff) | |
| download | git-9c17ccaa49d00a87cefe0ef18a371e4f45e968fc.tar.gz | |
Merge branch 'nd/git-common-dir-fix' into maint
"git rev-parse --git-common-dir" used in the worktree feature
misbehaved when run from a subdirectory.
* nd/git-common-dir-fix:
rev-parse: take prefix into account in --git-common-dir
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2027-worktree-list.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t2027-worktree-list.sh b/t/t2027-worktree-list.sh index 75ebb1b4a0..1b1b65a6b0 100755 --- a/t/t2027-worktree-list.sh +++ b/t/t2027-worktree-list.sh @@ -8,6 +8,16 @@ test_expect_success 'setup' ' test_commit init ' +test_expect_success 'rev-parse --git-common-dir on main worktree' ' + git rev-parse --git-common-dir >actual && + echo .git >expected && + test_cmp expected actual && + mkdir sub && + git -C sub rev-parse --git-common-dir >actual2 && + echo sub/.git >expected2 && + test_cmp expected2 actual2 +' + test_expect_success '"list" all worktrees from main' ' echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect && test_when_finished "rm -rf here && git worktree prune" && |