Re: [PATCH v3 22/23] worktree: add: auto-vivify new branch when <branch> is omitted

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 7, 2015, 16:10 UTC
Message-ID: <xmqqmvz83q4s.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20150707013301.GA26523@flurp.local>

Eric Sunshine <sunshine@sunshineco.com> writes:

>> Which may be something we would want to have a test for, though.
>
> Good idea. How about the following as a squash-in?

Sounds sensible.

At this point we do not have "worktree list", but if we gained that, we may want to add this as one more postcondition after the failed "worktree add":

       git worktree list >actual &&
       ! grep precious actual

but that should happen in the series that adds "worktree list" ;-)

Show 26 quoted lines

> --- 8< ---
> From: Eric Sunshine <sunshine@sunshineco.com>
> Subject: [PATCH] fixup! worktree: add: auto-vivify new branch when <branch> is omitted
>
> ---
>  t/t2025-worktree-add.sh | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
> index 8fe242f..ead8aa2 100755
> --- a/t/t2025-worktree-add.sh
> +++ b/t/t2025-worktree-add.sh
> @@ -150,4 +150,13 @@ test_expect_success '"add" with <branch> omitted' '
>  	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