From 1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Mon, 6 Jul 2015 13:30:59 -0400 Subject: worktree: add: auto-vivify new branch when is omitted As a convenience, when is omitted from "git worktree " and neither -b nor -B is used, automatically create a new branch named after , as if "-b $(basename )" was specified. Thus, "git worktree add ../hotfix" creates a new branch named "hotfix" and associates it with new worktree "../hotfix". Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- t/t2025-worktree-add.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 't/t2025-worktree-add.sh') diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index 8964dec75a..ead8aa2a9d 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -145,4 +145,18 @@ test_expect_success '"add -b" with omitted' ' test_cmp_rev HEAD burble ' +test_expect_success '"add" with omitted' ' + git worktree add wiffle/bat && + test_cmp_rev HEAD bat +' + +test_expect_success '"add" auto-vivify does not clobber existing branch' ' + test_commit c1 && + test_commit c2 && + git branch precious HEAD~1 && + test_must_fail git worktree add precious && + test_cmp_rev HEAD~1 precious && + test_path_is_missing precious +' + test_done -- cgit v1.2.1