Re: [PATCH v4 2/4] worktree: be clearer when "add" dwim-ery kicks in
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Mar 20, 2018, 07:32 UTC
- Message-ID
- <CAPig+cQPhXxVswMbD5HsUJpa9AHfet4zFb+MV3FT_-CuZP8+gw@mail.gmail.com>
- In-Reply-To
- <CAPig+cSsqqn+Wg6DEJRSge9mYqb1_jPXy5ORryrdA6+Omxne1A@mail.gmail.com>
On Tue, Mar 20, 2018 at 3:26 AM, Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 24 quoted lines
> On Sat, Mar 17, 2018 at 6:22 PM, Thomas Gummerer <t.gummerer@gmail.com> wrote:
>> Currently there is no indication in the "git worktree add" output that
>> a new branch was created. This would be especially useful information
>> in the case where the dwim of "git worktree add <path>" kicks in, as the
>> user didn't explicitly ask for a new branch, but we create one from
>> them.
>>
>> Print some additional output showing that a branch was created and the
>> branch name to help the user.
>> [...]
>> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
>> ---
>> diff --git a/builtin/worktree.c b/builtin/worktree.c
>> @@ -318,6 +318,9 @@ static int add_worktree(const char *path, const char *refname,
>> + if (opts->new_branch)
>> + fprintf(stderr, _("creating new branch '%s'"), opts->new_branch);
>> +
>> fprintf(stderr, _("worktree HEAD is now at %s"),
>> find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
>
> The "creating" message is missing a newline, which results in rather
> ugly output:
>
> creating new branch 'foo'worktree HEAD is now at ...Also, I believe that the agreement[1] was that this message should say merely "creating branch", not "creating _new_ branch". And, indeed, patch 4/4 stealthily drops "new" from the message, but it really ought to be introduced with correct text in this patch, not fixed by 4/4.
[1]: https://public-inbox.org/git/xmqqh8qv9ojb.fsf@gitster-ct.c.googlers.com/