Thread (100 messages) 100 messages, 4 authors, 2018-04-28

Re: [PATCH v4 2/4] worktree: be clearer when "add" dwim-ery kicks in

From: Thomas Gummerer <hidden>
Date: 2018-03-24 20:32:11

On 03/20, Eric Sunshine wrote:
On Tue, Mar 20, 2018 at 3:26 AM, Eric Sunshine [off-list ref] wrote:
quoted
On Sat, Mar 17, 2018 at 6:22 PM, Thomas Gummerer [off-list ref] wrote:
quoted
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 <redacted>
---
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.
Ah yeah thanks for catching those, will fix.
[1]: https://public-inbox.org/git/xmqqh8qv9ojb.fsf@gitster-ct.c.googlers.com/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help