From: Jacob Abel <jacobabel@nullpo.dev>
To: phillip.wood@dunelm.org.uk
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Rubén Justo" <rjusto@gmail.com>, "Taylor Blau" <me@ttaylorr.com>,
rsbecker@nexbridge.com
Subject: Re: [PATCH] worktree add: introduce basic DWYM for --orphan
Date: Wed, 18 Jan 2023 20:43:39 +0000 [thread overview]
Message-ID: <20230118204323.gn6rs3gydybsqt4g@phi> (raw)
In-Reply-To: <cddc6987-3b58-4688-65f8-3da0fbd1cc51@dunelm.org.uk>
On 23/01/16 10:52AM, Phillip Wood wrote:
> Hi Jacob
>
> On 14/01/2023 22:50, Jacob Abel wrote:
> > Introduces a DWYM shorthand of --orphan for when the worktree directory
> > and the to-be-created branch share the same name.
> >
> > Current Behavior:
> > % git worktree list
> > /path/to/git/repo a38d39a4c5 [main]
> > % git worktree add --orphan new_branch ../new_branch/
> > Preparing worktree (new branch 'new_branch')
> > % git worktree add --orphan ../new_branch2/
> > usage: git worktree add [<options>] <path> [<commit-ish>]
> > or: git worktree list [<options>]
> > [...]
> > %
> >
> > New Behavior:
> >
> > % git worktree list
> > /path/to/git/repo a38d39a4c5 [main]
> > % git worktree add --orphan new_branch ../new_branch/
> > Preparing worktree (new branch 'new_branch')
> > % git worktree list
> > /path/to/git/repo a38d39a4c5 [main]
> > /path/to/git/new_branch a38d39a4c5 [new_branch]
> > % git worktree add --orphan ../new_branch2/
> > Preparing worktree (new branch 'new_branch2')
> > % git worktree list
> > /path/to/git/repo a38d39a4c5 [main]
> > /path/to/git/new_branch a38d39a4c5 [new_branch]
> > /path/to/git/new_branch2 a38d39a4c5 [new_branch2]
> > %
>
> Thanks for working on this. As I said in my previous mail I think it
> would be easier to use OPT_BOOL() for --orphan from the start. By using
> OPT_STRING() you'll run into problems with "git worktree add --orphan
> --lock <directory>"
>
> Best Wishes
>
> Phillip
>
> > [...]
Ah, good point. I missed that.
Also given the way the conversation is going, I'll drop this patch and integrate
the changes into the patches of the main series since I'll be re-rolling.
prev parent reply other threads:[~2023-01-18 20:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-14 22:50 [PATCH] worktree add: introduce basic DWYM for --orphan Jacob Abel
2023-01-14 22:58 ` Jacob Abel
2023-01-16 10:52 ` Phillip Wood
2023-01-18 20:43 ` Jacob Abel [this message]
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=20230118204323.gn6rs3gydybsqt4g@phi \
--to=jacobabel@nullpo.dev \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rjusto@gmail.com \
--cc=rsbecker@nexbridge.com \
--cc=sunshine@sunshineco.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).