diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:17 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:17 -0800 |
commit | 39b8980bb9eacfff0f28101e71354350fdfc5340 (patch) | |
tree | 9b5f3d75a739b3acacbaefbe1657c17973804f12 /t/t2027-worktree-list.sh | |
parent | Merge branch 'mm/two-more-xstrfmt' (diff) | |
parent | rev-parse: fix several options when running in a subdirectory (diff) | |
download | tgif-39b8980bb9eacfff0f28101e71354350fdfc5340.tar.xz |
Merge branch 'js/git-path-in-subdir'
The "--git-path", "--git-common-dir", and "--shared-index-path"
options of "git rev-parse" did not produce usable output. They are
now updated to show the path to the correct file, relative to where
the caller is.
* js/git-path-in-subdir:
rev-parse: fix several options when running in a subdirectory
rev-parse tests: add tests executed from a subdirectory
Diffstat (limited to 't/t2027-worktree-list.sh')
-rwxr-xr-x | t/t2027-worktree-list.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/t/t2027-worktree-list.sh b/t/t2027-worktree-list.sh index 465eeeacd3..848da5f368 100755 --- a/t/t2027-worktree-list.sh +++ b/t/t2027-worktree-list.sh @@ -14,10 +14,18 @@ test_expect_success 'rev-parse --git-common-dir on main worktree' ' test_cmp expected actual && mkdir sub && git -C sub rev-parse --git-common-dir >actual2 && - echo sub/.git >expected2 && + echo ../.git >expected2 && test_cmp expected2 actual2 ' +test_expect_success 'rev-parse --git-path objects linked worktree' ' + echo "$(git rev-parse --show-toplevel)/.git/objects" >expect && + test_when_finished "rm -rf linked-tree && git worktree prune" && + git worktree add --detach linked-tree master && + git -C linked-tree rev-parse --git-path objects >actual && + test_cmp expect actual +' + 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" && |