Sorry about the noise with v2 and v3 so quickly one after another. I only too late realized that the new dwim for 'add <path> <branch>' doesn't make much sense if -b or --detach are given, and it's better to keep on erroring out in these cases. The previous rounds were at https://public-inbox.org/git/20171112134305.3949-1-t.gummerer@xxxxxxxxx/ and https://public-inbox.org/git/20171118181103.28354-1-t.gummerer@xxxxxxxxx/. In case anybody already started reading v2, an interdiff between the two versions is below: diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 11cac104d9..eedead2c4c 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -52,9 +52,9 @@ is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as `<branch>`; it is synonymous with `@{-1}`. + -If <branch> is not found but there does exist a tracking branch in -exactly one remote (call it <remote>) with a matching name, treat as -equivalent to +If <branch> is not found, and neither `-b` nor `-B` nor `--detach` are +used, but there does exist a tracking branch in exactly one remote +(call it <remote>) with a matching name, treat as equivalent to ------------ $ git worktree add -b <branch> <path> <remote>/<branch> ------------ diff --git a/builtin/worktree.c b/builtin/worktree.c index 82088415b8..b2a6dd020c 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -396,7 +396,7 @@ static int add(int ac, const char **av, const char *prefix) } } - if (ac == 2) { + if (ac == 2 && !opts.new_branch && !opts.detach) { struct object_id oid; struct commit *commit; const char *remote; diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index a566d867fe..87e233f812 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -347,6 +347,8 @@ test_expect_success '"add" <path> <branch> dwims' ' git config remote.repo_upstream.fetch \ "refs/heads/*:refs/remotes/repo_upstream/*" && git fetch --all && + test_must_fail git worktree add -b foo ../foo foo && + test_must_fail git worktree add --detach ../foo foo && git worktree add ../foo foo ) && ( Thomas Gummerer (3): checkout: factor out functions to new lib file worktree: make add <path> <branch> dwim worktree: make add <path> dwim Documentation/git-worktree.txt | 22 +++++++-- Makefile | 1 + builtin/checkout.c | 41 +--------------- builtin/worktree.c | 24 ++++++++++ checkout.c | 42 ++++++++++++++++ checkout.h | 13 +++++ t/t2025-worktree-add.sh | 106 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 206 insertions(+), 43 deletions(-) create mode 100644 checkout.c create mode 100644 checkout.h -- 2.15.0.345.gf926f18f3
