diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:28 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:28 -0800 |
commit | 237aa99cd26da4daf9b2e75914ae17ecc9051f0c (patch) | |
tree | 89c37b586c70c52c12343d35c0655fc699b4da5f /t/t2025-worktree-add.sh | |
parent | Merge branch 'tb/delimit-pretty-trailers-args-with-comma' (diff) | |
parent | clone: support 'clone --shared' from a worktree (diff) | |
download | tgif-237aa99cd26da4daf9b2e75914ae17ecc9051f0c.tar.xz |
Merge branch 'es/clone-shared-worktree'
"git clone --shared" to borrow from a (secondary) worktree did not
work, even though "git clone --local" did. Both are now accepted.
* es/clone-shared-worktree:
clone: support 'clone --shared' from a worktree
Diffstat (limited to 't/t2025-worktree-add.sh')
-rwxr-xr-x | t/t2025-worktree-add.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index 1285668cfc..2b95944973 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -245,6 +245,12 @@ test_expect_success 'local clone from linked checkout' ' ( cd here-clone && git fsck ) ' +test_expect_success 'local clone --shared from linked checkout' ' + git -C bare worktree add --detach ../baretree && + git clone --local --shared baretree bare-clone && + grep /bare/ bare-clone/.git/objects/info/alternates +' + test_expect_success '"add" worktree with --no-checkout' ' git worktree add --no-checkout -b swamp swamp && ! test -e swamp/init.t && |