Re: [PATCH v4] worktree: add: introduce --checkout option
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:09:04
Ray Zhang [off-list ref] writes:
By adding this option which defaults to true, we can use the corresponding --no-checkout to make some customizations before the checkout, like sparse checkout, etc. Helped-by: Eric Sunshine [off-list ref] Helped-by: Junio C Hamano [off-list ref] Reviewed-by: Eric Sunshine <redacted> Signed-off-by: Ray Zhang <redacted> ---
Thanks. Will queue.
quoted hunk
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index cbfa41e..472b811 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh@@ -213,4 +213,17 @@ test_expect_success 'local clone from linked checkout' ' ( cd here-clone && git fsck ) ' +test_expect_success '"add" worktree with --no-checkout' ' + git worktree add --no-checkout -b swamp swamp && + ls swamp >actual && + test_line_count = 0 actual &&
The remainder of the test (both existing and added parts) seems to only care about init.t; running "ls swamp" feels somewhat inconsistent. We could replace the two lines with ! test -e swamp/init.t to address this, but I do not think it is worth a patch churn.
+ git -C swamp reset --hard && + test_cmp init.t swamp/init.t +' +test_expect_success '"add" worktree with --checkout' ' + git worktree add --checkout -b swmap2 swamp2 && + test_cmp init.t swamp2/init.t +' + test_done