worktree: improve worktree setup message

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 25fe25b45f7771bb3b000ae92aa5f24875adc51e..5f0e3c28e88e5a02be0c0fe4b8603faae26ad7e6 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -245,7 +245,7 @@ static int add_worktree(const char *path, const char **child_argv)
        strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
        write_file(sb.buf, 1, "../..\n");
 
-       fprintf_ln(stderr, _("Enter %s (identifier %s)"), path, name);
+       fprintf_ln(stderr, _("Preparing %s (identifier %s)"), path, name);
 
        setenv("GIT_CHECKOUT_NEW_WORKTREE", "1", 1);
        setenv(GIT_DIR_ENVIRONMENT, sb_git.buf, 1);
@@ -289,11 +289,17 @@ static int add(int ac, const char **av, const char *prefix)
        ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
        if (new_branch && new_branch_force)
                die(_("-b and -B are mutually exclusive"));
-       if (ac != 2)
+       if (ac < 1 || ac > 2)
                usage_with_options(worktree_usage, options);
 
        path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0];
-       branch = av[1];
+       branch = ac < 2 ? "HEAD" : av[1];
+
+       if (ac < 2 && !new_branch && !new_branch_force) {
+               int n;
+               const char *s = worktree_basename(path, &n);
+               new_branch = xstrndup(s, n);
+       }
 
        argv_array_push(&cmd, "checkout");
        if (force)