From patchwork Sat Jan 14 22:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Abel X-Patchwork-Id: 13102124 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40D7AC46467 for ; Sat, 14 Jan 2023 22:50:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229676AbjANWuk (ORCPT ); Sat, 14 Jan 2023 17:50:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbjANWui (ORCPT ); Sat, 14 Jan 2023 17:50:38 -0500 Received: from mail-4317.proton.ch (mail-4317.proton.ch [185.70.43.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45181E3B3 for ; Sat, 14 Jan 2023 14:50:37 -0800 (PST) Date: Sat, 14 Jan 2023 22:50:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nullpo.dev; s=protonmail3; t=1673736635; x=1673995835; bh=DK0Zzm0i7NSnV8hbEp/I+6dlkOy6RQi4tItEC/sm/UY=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=N0Hi+Q8DXKlVB3wmMir3vijPhVNvCI0wU8GX6C+NluXsju44ztT4mFsPZHnAb5uGG Iu5hiD5nYCEBUBRgBziMyZ1vEZxTGADRqPZ5SW08Rf0gHMHbQ8U8PZzw6Mwdyknrco ZgSX47SKqEpVkhMu/1VOxI5Sck21GhVZp/pT/1NUcSAvRhgnC42TzpOdrQeoLiDSkY OyvMVPZ5PWinyXib7hSew2AZ8t3D7cPi0c0+xzbMyN5govOqKCrWIJ+Keg9q2Hw4Hp IzZdvHBgSmwoPKAdQjmnMnTY5uN+dcS+71WyqcC0dlyaFVu64BpWxUXNk/YdPcwt1r v7Z57tKQXegkA== To: git@vger.kernel.org From: Jacob Abel Cc: Jacob Abel , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , Eric Sunshine , Junio C Hamano , Phillip Wood , =?utf-8?q?Rub=C3=A9n_Justo?= , Taylor Blau , rsbecker@nexbridge.com Subject: [PATCH] worktree add: introduce basic DWYM for --orphan Message-ID: <20230114224956.24801-1-jacobabel@nullpo.dev> Feedback-ID: 21506737:user:proton MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 [] [] or: git worktree list [] [...] % 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] % Signed-off-by: Jacob Abel --- Documentation/git-worktree.txt | 13 +++++++++---- builtin/worktree.c | 21 +++++++++++++++------ t/t2400-worktree-add.sh | 10 ++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) -- 2.38.2 diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index d78460c29c..a56ddb0185 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason ]] [(-b | -B) ] [] 'git worktree add' [-f] [--lock [--reason ]] - --orphan + --orphan [] 'git worktree list' [-v | --porcelain [-z]] 'git worktree lock' [--reason ] 'git worktree move' @@ -99,13 +99,16 @@ in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless `--force` is used). + ------------ -$ git worktree add --orphan +$ git worktree add --orphan [] ------------ + Create a worktree containing no files, with an empty index, and associated with a new orphan branch named ``. The first commit made on this new branch will have no parents and will be the root of a new history disconnected from any other branches. ++ +If a branch name `` is not supplied, the name is derived from the +supplied path ``. list:: @@ -233,9 +236,11 @@ This can also be set up as the default behaviour by using the With `prune`, do not remove anything; just report what it would remove. ---orphan :: +--orphan []:: With `add`, make the new worktree and index empty, associating - the worktree with a new orphan branch named ``. + the worktree with a new orphan branch named ``. If + `` is not supplied, the new branch name is derived + from ``. --porcelain:: With `list`, output in an easy-to-parse format for scripts. diff --git a/builtin/worktree.c b/builtin/worktree.c index d975628353..481f895075 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -19,7 +19,7 @@ N_("git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" \ " [(-b | -B) ] []"), \ N_("git worktree add [-f] [--lock [--reason ]]\n" \ - " --orphan ") + " --orphan [] ") #define BUILTIN_WORKTREE_LIST_USAGE \ N_("git worktree list [-v | --porcelain [-z]]") @@ -681,10 +681,13 @@ static int add(int ac, const char **av, const char *prefix) else if (keep_locked) opts.keep_locked = _("added with --lock"); - if (ac < 1 || ac > 2) + if (ac < 1 && opts.orphan) { + path = prefix_filename(prefix, orphan_branch); + } else if (ac >= 1 && ac <= 2) { + path = prefix_filename(prefix, av[0]); + } else { usage_with_options(git_worktree_add_usage, options); - - path = prefix_filename(prefix, av[0]); + } branch = ac < 2 ? "HEAD" : av[1]; if (!strcmp(branch, "-")) @@ -702,14 +705,20 @@ static int add(int ac, const char **av, const char *prefix) strbuf_release(&symref); } - if (opts.orphan) { - new_branch = orphan_branch; + if (ac < 1 && opts.orphan) { + const char *s = dwim_branch(path, &orphan_branch); + if (s) + orphan_branch = s; } else if (ac < 2 && !new_branch && !opts.detach) { const char *s = dwim_branch(path, &new_branch); if (s) branch = s; } + if (opts.orphan) { + new_branch = orphan_branch; + } + if (ac == 2 && !new_branch && !opts.detach) { struct object_id oid; struct commit *commit; diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh index 1bf8d619e2..c3de277738 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -354,6 +354,16 @@ test_expect_success '"add --orphan" fails if the branch already exists' ' test_path_is_missing orphandir2 ' +test_expect_success '"add --orphan" with basic DWYM' ' + test_when_finished "rm -rf empty_repo" && + echo refs/heads/worktreedir >expected && + GIT_DIR="empty_repo" git init --bare && + # Use non-trivial path to verify it DWYMs properly. + git -C empty_repo worktree add --orphan ../empty_repo/worktreedir && + git -C empty_repo/worktreedir symbolic-ref HEAD >actual && + test_cmp expected actual +' + test_expect_success '"add --orphan" with empty repository' ' test_when_finished "rm -rf empty_repo" && echo refs/heads/newbranch >expected &&