From: Junio C Hamano <gitster@pobox•com>
To: Eric Sunshine <sunshine@sunshineco•com>
Cc: git@vger•kernel.org, Duy Nguyen <pclouds@gmail•com>,
Mark Levedahl <mlevedahl@gmail•com>,
Mikael Magnusson <mikachu@gmail•com>
Subject: Re: [PATCH v3 22/23] worktree: add: auto-vivify new branch when <branch> is omitted
Date: Mon, 06 Jul 2015 12:19:14 -0700 [thread overview]
Message-ID: <xmqqpp45ytzh.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1436203860-846-23-git-send-email-sunshine@sunshineco.com> (Eric Sunshine's message of "Mon, 6 Jul 2015 13:30:59 -0400")
Eric Sunshine <sunshine@sunshineco•com> writes:
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index 377ae0f..da71f50 100644
> --- a/Documentation/git-worktree.txt
> +++ b/Documentation/git-worktree.txt
> @@ -9,7 +9,7 @@ git-worktree - Manage multiple worktrees
> SYNOPSIS
> --------
> [verse]
> -'git worktree add' [-f] [--detach] [-b <new-branch>] <path> <branch>
> +'git worktree add' [-f] [--detach] [-b <new-branch>] <path> [<branch>]
Ahh, OK, this answers my previous question.
> + if (ac < 2 && !new_branch && !new_branch_force) {
> + int n;
> + const char *s = worktree_basename(path, &n);
> + new_branch = xstrndup(s, n);
> + }
> +
and because this is new_branch, not new_branch_force, we will not
accidentally clobber an existing branch. The "hotfix" time is when
the end-user tends to be less careful, and it is a good thing to
make sure "git worktree add ../hotfix" will not clobber an unrelated
"hotfix" branch.
Good.
Which may be something we would want to have a test for, though.
> diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
> index 8964dec..8fe242f 100755
> --- a/t/t2025-worktree-add.sh
> +++ b/t/t2025-worktree-add.sh
> @@ -145,4 +145,9 @@ 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_done
next prev parent reply other threads:[~2015-07-06 19:19 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-06 17:30 [PATCH v3 00/23] replace "checkout --to" with "worktree add" Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 01/23] Documentation/git-checkout: fix incorrect worktree prune command Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 02/23] Documentation/git-worktree: associate options with commands Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 03/23] Documentation: move linked worktree description from checkout to worktree Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 04/23] Documentation/git-worktree: add BUGS section Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 05/23] Documentation/git-worktree: split technical info from general description Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 06/23] Documentation/git-worktree: add high-level 'lock' overview Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 07/23] Documentation/git-worktree: add EXAMPLES section Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 08/23] checkout: fix bug with --to and relative HEAD Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 09/23] checkout: relocate --to's "no branch specified" check Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 10/23] checkout: prepare_linked_checkout: drop now-unused 'new' argument Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 11/23] checkout: make --to unconditionally verbose Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 12/23] checkout: drop 'checkout_opts' dependency from prepare_linked_checkout Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 13/23] worktree: introduce "add" command Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 14/23] worktree: add --force option Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 15/23] worktree: add --detach option Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 16/23] worktree: add -b/-B options Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 17/23] tests: worktree: retrofit "checkout --to" tests for "worktree add" Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 18/23] checkout: retire --to option Eric Sunshine
2015-07-06 19:41 ` Junio C Hamano
2015-07-07 7:08 ` Eric Sunshine
2015-07-08 16:58 ` Junio C Hamano
2015-07-06 17:30 ` [PATCH v3 19/23] checkout: require worktree unconditionally Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 20/23] worktree: extract basename computation to new function Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 21/23] worktree: add: make -b/-B default to HEAD when <branch> is omitted Eric Sunshine
2015-07-06 17:30 ` [PATCH v3 22/23] worktree: add: auto-vivify new branch " Eric Sunshine
2015-07-06 19:19 ` Junio C Hamano [this message]
2015-07-07 1:33 ` Eric Sunshine
2015-07-07 16:10 ` Junio C Hamano
2015-07-06 17:31 ` [PATCH v3 23/23] checkout: retire --ignore-other-worktrees in favor of --force Eric Sunshine
2015-07-06 19:40 ` Junio C Hamano
2015-07-07 8:24 ` Eric Sunshine
2015-07-07 9:41 ` Eric Sunshine
2015-07-07 16:20 ` Junio C Hamano
2015-07-07 23:10 ` Eric Sunshine
2015-07-08 0:43 ` Mark Levedahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpp45ytzh.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mikachu@gmail$(echo .)com \
--cc=mlevedahl@gmail$(echo .)com \
--cc=pclouds@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox