diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2015-07-06 13:30:59 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-07 14:34:32 -0700 |
| commit | 1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3 (patch) | |
| tree | 300efa4a8e232730a677a9337d591d12388eebaa /t/t2025-worktree-add.sh | |
| parent | 0f4af3b9ea1fc62e445271bb2e7fbb8e1ac230b7 (diff) | |
| download | git-1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3.tar.gz | |
worktree: add: auto-vivify new branch when <branch> is omitted
As a convenience, when <branch> is omitted from "git worktree <path>
<branch>" and neither -b nor -B is used, automatically create a new
branch named after <path>, as if "-b $(basename <path>)" 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 <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2025-worktree-add.sh')
| -rwxr-xr-x | t/t2025-worktree-add.sh | 14 |
1 files changed, 14 insertions, 0 deletions
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 <branch> omitted' ' test_cmp_rev HEAD burble ' +test_expect_success '"add" with <branch> 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 |