From: Eric Sunshine <email@example.com>
To: Duy Nguyen <firstname.lastname@example.org>
Cc: Michael J Gruber <email@example.com>,
Junio C Hamano <firstname.lastname@example.org>,
Git Mailing List <email@example.com>
Subject: Re: A few "linked checkout" niggles
Date: Fri, 17 Jul 2015 13:02:57 -0400 [thread overview]
Message-ID: <CAPig+cRSHwmmF9cCUbRrDCCW4kvg9PeOUxP5VQpSGfxzMxHWOQ@mail.gmail.com> (raw)
On Fri, Jul 17, 2015 at 8:49 AM, Duy Nguyen <firstname.lastname@example.org> wrote:
> On Fri, Jul 17, 2015 at 7:27 PM, Michael J Gruber
> <email@example.com> wrote:
>> Two more observations:
>> $ git worktree add /tmp/gitwt
>> Enter /tmp/gitwt (identifier gitwt)
>> Switched to a new branch 'gitwt'
>> Now I'm in /tmp/gitwt at branch gitwt. Right? No. I'm in the original wd
>> at the original branch.
>> So either we cd to the new location or quelch these messages or add a
>> message that we're actually back.
> s/Enter/Preparing/ ?
Presumably you're using 'master'. The "Switched to a new branch"
message is an artifact of using git-checkout for the back-end
operation, however, what is queued in 'pu' no long uses git-checkout
at all, so that message is gone.
I agree with Duy that s/Enter/Prepare/ would be a good idea. I don't
think we want to drop the message altogether as Junio suggested since
other messages such as "Checking out files:..." and "HEAD is now
at...." follow it, thus "Prepare..." provides context indicating that
those additional messages apply to the new worktree rather than the
>> The other:
>> linked worktrees are prefect for short term tests on detached heads.
>> Even the manual page advertises detach. But:
>> $ git worktree add --detach /tmp/gitwtt
>> Enter /tmp/gitwtt (identifier gitwtt)
>> fatal: '--detach' cannot be used with '-b/-B/--orphan'
>> Maybe it's the auto-naming logic stepping on detached toes ;)
> Problem with master (but not with pu) because "-b gitwtt" is
> automatically added. I think this is 1eb07d8 (worktree: add:
> auto-vivify new branch when <branch> is omitted - 2015-07-06)
> forgetting about --detach. Actually it's still a problem with 'pu'
> because the branch 'gitwtt' is created unnecessarily.
Yep. Again, that fatal error is an artifact from git-checkout being
used as the back-end on 'master'. What is queued on 'pu' doesn't fail,
however, as Duy notes, the auto-vivication incorrectly kicks in and
creates a new branch unnecessarily. That'll have to be fixed in v3.
prev parent reply other threads:[~2015-07-17 17:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 23:13 A few "linked checkout" niggles Junio C Hamano
2015-07-16 5:24 ` Duy Nguyen
2015-07-16 5:40 ` Eric Sunshine
2015-07-16 20:39 ` Junio C Hamano
2015-07-16 23:13 ` Duy Nguyen
2015-07-17 3:11 ` Eric Sunshine
2015-07-17 12:27 ` Michael J Gruber
2015-07-17 12:49 ` Duy Nguyen
2015-07-17 15:19 ` Junio C Hamano
2015-07-17 17:07 ` Eric Sunshine
2015-07-17 17:02 ` Eric Sunshine [this message]
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:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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.
Code repositories for project(s) associated with this public inbox
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 read-only IMAP folder(s) and NNTP newsgroup(s).