git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Duy Nguyen <pclouds@gmail.com>,
	Michael J Gruber <git@drmicha.warpmail.net>
Subject: Re: [PATCH v3 14/22] worktree: add: suppress auto-vivication with --detach and no <branch>
Date: Fri, 17 Jul 2015 19:20:40 -0400	[thread overview]
Message-ID: <20150717232040.GA85140@flurp.local> (raw)
In-Reply-To: <1437174017-81687-15-git-send-email-sunshine@sunshineco.com>

On Fri, Jul 17, 2015 at 07:00:09PM -0400, Eric Sunshine wrote:
> Fix oversight where branch auto-vivication incorrectly kicks in when
> --detach is specified and <branch> omitted. Instead, treat:
> 
>     git worktree add --detach <path>
> 
> as shorthand for:
> 
>     git worktree add --detach <path> HEAD
> 
> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
> ---
>  builtin/worktree.c      |  2 +-
>  t/t2025-worktree-add.sh | 14 ++++++++++++++
>  2 files changed, 15 insertions(+), 1 deletion(-)

I meant, but forgot, to include a documentation update with this patch.
Here it is as a squash-in:

---- 8< ----
From: Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v3 23/22] fixup! worktree: add: suppress auto-vivication with --detach and no <branch>

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
 Documentation/git-worktree.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index da71f50..834a61c 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -51,9 +51,9 @@ Create `<path>` and checkout `<branch>` into it. The new working directory
 is linked to the current repository, sharing everything except working
 directory specific files such as HEAD, index, etc.
 +
-If `<branch>` is omitted and neither `-b` nor `-B` is used, then, as a
-convenience, a new branch based at HEAD is created automatically, as if
-`-b $(basename <path>)` was specified.
+If `<branch>` is omitted and neither `-b` nor `-B` nor `--detached` used,
+then, as a convenience, a new branch based at HEAD is created automatically,
+as if `-b $(basename <path>)` was specified.
 
 prune::
 
-- 
2.5.0.rc2.378.g0af52e8

  reply	other threads:[~2015-07-17 23:20 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-17 22:59 [PATCH v3 00/22] rid git-checkout of too-intimate knowledge of new worktree Eric Sunshine
2015-07-17 22:59 ` [PATCH v3 01/22] checkout: avoid resolving HEAD unnecessarily Eric Sunshine
2015-07-17 22:59 ` [PATCH v3 02/22] checkout: name check_linked_checkouts() more meaningfully Eric Sunshine
2015-07-17 22:59 ` [PATCH v3 03/22] checkout: improve die_if_checked_out() robustness Eric Sunshine
2015-07-17 22:59 ` [PATCH v3 04/22] checkout: die_if_checked_out: simplify strbuf management Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 05/22] checkout: generalize die_if_checked_out() branch name argument Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 06/22] checkout: check_linked_checkout: improve "already checked out" aesthetic Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 07/22] checkout: check_linked_checkout: simplify symref parsing Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 08/22] checkout: teach check_linked_checkout() about symbolic link HEAD Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 09/22] branch: publish die_if_checked_out() Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 10/22] worktree: improve worktree setup message Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 11/22] worktree: simplify new branch (-b/-B) option checking Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 12/22] worktree: introduce options container Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 13/22] worktree: make --detach mutually exclusive with -b/-B Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 14/22] worktree: add: suppress auto-vivication with --detach and no <branch> Eric Sunshine
2015-07-17 23:20   ` Eric Sunshine [this message]
2015-07-17 23:00 ` [PATCH v3 15/22] worktree: make branch creation distinct from worktree population Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 16/22] worktree: elucidate environment variables intended for child processes Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 17/22] worktree: add_worktree: construct worktree-population command locally Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 18/22] worktree: detect branch-name/detached and error conditions locally Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 19/22] worktree: make setup of new HEAD distinct from worktree population Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 20/22] worktree: avoid resolving HEAD unnecessarily Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 21/22] worktree: populate via "git reset --hard" rather than "git checkout" Eric Sunshine
2015-07-17 23:00 ` [PATCH v3 22/22] checkout: drop intimate knowledge of newly created worktree Eric Sunshine

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=20150717232040.GA85140@flurp.local \
    --to=sunshine@sunshineco.com \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).