From: Thomas Gummerer <t.gummerer@gmail.com>
To: Paul Smith <paul@mad-scientist.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4 4/4] worktree: make add <path> dwim
Date: Sat, 25 Nov 2017 20:06:15 +0000 [thread overview]
Message-ID: <20171125200615.GA4344@hank> (raw)
In-Reply-To: <1511634365.2847.211.camel@mad-scientist.net>
On 11/25, Paul Smith wrote:
> On Sat, 2017-11-25 at 17:50 +0000, Thomas Gummerer wrote:
> > This would be the output in the new version:
> >
> > $ git worktree add ../bla
> > Branch 'bla' set up to track remote branch 'bla' from 'origin'.
> > Preparing ../bla (identifier bla)
> > HEAD is now at 4aade43 bla
> >
> > vs. the output without the changed behaviour:
> >
> > $ git worktree add ../bla
> > Preparing ../bla (identifier bla)
> > HEAD is now at 0f215c9 initial import
> >
> > Of course that assumes that it's used directly, not in scripts, and
> > that users will actually read the output of the command when they
> > invoke it. Maybe these are not safe assumptions to make though, and
> > we'd rather not have this on by default then. As I mentioned
> > previously I would prefer having this as default, but I'm happy to
> > hide this behaviour behind a flag if we want to be more careful about
> > introducing this. Dunno?
>
> Speaking as a simple user, I find the current behavior of Git worktree
> add very frustrating; I am constantly wanting to create worktrees for
> other peoples' branches so I can look at the code there without messing
> up my workspace, and it's really inconvenient to do that now.
>
> Also, the current special handling of the directory name as a putative
> branch name is not helpful for me because many of the branches I need
> to examine use "/" as their separator. I don't begrudge making that
> feature more "DWIM" for those that can use it, but hopefully some help
> is forthcoming for those who can't.
>
> For example, I need to create a local worktree for the remote rel/1.0
> branch... what do I do?
>
> What I want to work is this:
>
> git worktree add ../1.0 rel/1.0
>
> and have it create a worktree at ../1.0, then do the equivalent of "git
> checkout rel/1.0" which includes setting up to track the remote branch.
> But of course this doesn't work at all; I get:
>
> fatal: invalid reference: rel/1.0
>
> Personally I would think it odd to have to add an extra flag to get
> what I would expect would be "normal" behavior (checkout).
>
> But maybe that's just me.
This part is getting done in 3/4, and is definitely going to work
without an additional flag, so this is (hopefully) soon going to work
just as you want :)
This is less controversial because as you mentioned this currently
doesn't work at all, so there are no backwards compatibility worries.
For the other case of
git worktree add ../foo
however we currently document one behaviour, which I would like to
change (I usually have branches without a / in that I want to look at)
we currently document one behaviour, which I'd like to change. So in
that case we are a bit worried about backwards compatibility, and how
this will affect current users that have a certain expectation of how
the command is supposed to work, hence the discussion of whether to
hide the new behaviour behind a flag or not.
Either way, if we do put the behaviour behind a flag, I'll also add a
configuration variable, which can be set to enable the new behaviour
so one doesn't have to type out the flag all the time.
next prev parent reply other threads:[~2017-11-25 20:04 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <mailto:20171118224706.13810-1-t.gummerer@gmail.com>
2017-11-22 22:30 ` [PATCH v4 0/4] make git worktree add dwim more Thomas Gummerer
2017-11-22 22:30 ` [PATCH v4 1/4] checkout: factor out functions to new lib file Thomas Gummerer
2017-11-24 6:47 ` Junio C Hamano
2017-11-22 22:30 ` [PATCH v4 2/4] worktree: add --[no-]track option to the add subcommand Thomas Gummerer
2017-11-24 6:57 ` Junio C Hamano
2017-11-25 16:58 ` Thomas Gummerer
2017-11-22 22:30 ` [PATCH v4 3/4] worktree: make add <path> <branch> dwim Thomas Gummerer
2017-11-24 6:59 ` Junio C Hamano
2017-11-22 22:30 ` [PATCH v4 4/4] worktree: make add <path> dwim Thomas Gummerer
2017-11-24 7:11 ` Junio C Hamano
2017-11-25 17:50 ` Thomas Gummerer
2017-11-25 18:26 ` Paul Smith
2017-11-25 20:06 ` Thomas Gummerer [this message]
2017-11-25 20:39 ` Randall S. Becker
2017-11-25 21:48 ` Thomas Gummerer
2017-11-25 23:11 ` Paul Smith
2017-11-26 3:35 ` Junio C Hamano
2017-11-26 11:37 ` Thomas Gummerer
2017-11-26 19:43 ` [PATCH v5 0/6] make git worktree add dwim more Thomas Gummerer
2017-11-26 19:43 ` [PATCH v5 1/6] checkout: factor out functions to new lib file Thomas Gummerer
2017-11-26 19:43 ` [PATCH v5 2/6] worktree: add can be created from any commit-ish Thomas Gummerer
2017-11-26 19:43 ` [PATCH v5 3/6] worktree: add --[no-]track option to the add subcommand Thomas Gummerer
2017-11-26 19:43 ` [PATCH v5 4/6] worktree: make add <path> <branch> dwim Thomas Gummerer
2017-11-26 19:43 ` [PATCH v5 5/6] worktree: add --guess-remote flag to add subcommand Thomas Gummerer
2017-11-27 6:36 ` Junio C Hamano
2017-11-27 20:56 ` Thomas Gummerer
2017-11-26 19:43 ` [PATCH v5 6/6] add worktree.guessRemote config option Thomas Gummerer
2017-11-27 6:45 ` Junio C Hamano
2017-11-27 20:59 ` Thomas Gummerer
2017-11-29 20:04 ` [PATCH v6 0/6] make git worktree add dwim more Thomas Gummerer
2017-11-29 20:04 ` [PATCH v6 1/6] checkout: factor out functions to new lib file Thomas Gummerer
2017-11-29 20:04 ` [PATCH v6 2/6] worktree: add can be created from any commit-ish Thomas Gummerer
2017-11-29 20:04 ` [PATCH v6 3/6] worktree: add --[no-]track option to the add subcommand Thomas Gummerer
2017-11-29 20:04 ` [PATCH v6 4/6] worktree: make add <path> <branch> dwim Thomas Gummerer
2017-11-29 20:04 ` [PATCH v6 5/6] worktree: add --guess-remote flag to add subcommand Thomas Gummerer
2017-11-29 20:04 ` [PATCH v6 6/6] add worktree.guessRemote config option Thomas Gummerer
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
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 \
--in-reply-to=20171125200615.GA4344@hank \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=paul@mad-scientist.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).