From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id DBF922036D for ; Sat, 18 Nov 2017 22:45:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424474AbdKRWpr (ORCPT ); Sat, 18 Nov 2017 17:45:47 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:37036 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424408AbdKRWpp (ORCPT ); Sat, 18 Nov 2017 17:45:45 -0500 Received: by mail-wm0-f65.google.com with SMTP id v186so12329904wma.2 for ; Sat, 18 Nov 2017 14:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zJTcVjaUCds5I+c6mPHhlHMtqhVAvNNG+cxx5MquWA0=; b=SBj1KaPFhzv2ZT2CuvYCP2S1odHHQSV33yuW/tOvNgoBLCKNyFo/HmPLmAGhdWAqB+ nGptJVpDT5h4Ama7D36BdzQeEf4sxCrp5ti6lpBJUpnDj1qy9dJf9PuRmW5qYs8vTkVT 1xXf1h64Vvc0TciGN1b5hiSjUKY0nYDcVxY2XvX074bZJxzflQFtwlshXMjOzd8T5OVj T1+T/Abd3lS4BO6R8Awme9h0pcecvFDo1b8R5DmPq3iXbQr2yZXPQVYOXGMVUoZgH7Vs iBloYU9VKDV2WhQ2iT+fKp+DEyPtKK8IWEtgXzdvh2cAEvum2JnyTp9rDIyCPYkbBD2t v8QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zJTcVjaUCds5I+c6mPHhlHMtqhVAvNNG+cxx5MquWA0=; b=XcDI0FWUm5rtPAb3THZoNAV3JLe4ejSYbEZqT6pmKieasvNgR6zE5qtfv7Lc23czJK YWZViq3PmM1qOEWSR70YHfufoHIBZ3gZVru7DOOjeagrgsSM+HEUmWTmnPHR+AV2TS1t 0PxcpTfTZaFs5o0cPJEmu6+2Z8Oojtdwlxnh8wBa6UFAImB/eWEl0pD+Ets5HEA5uhun OeJXHfTurGzNeNggHHZPQd8F6f0gxlNijRKxTlmlN+oGrbIIKkZRg1/MlA9odXIQmT8A t6lDV5LCARahg3Y0vBgG3xrolN6BMK/hfq/wrk8imYso7zf+qp103ygWPtowR33/GhLQ LhaQ== X-Gm-Message-State: AJaThX4+BJzPoDXaRyD7oYOb3Ylgs2uKhIv4cctUHWse2saqutPaA83b fhFW/TE2Su5U62Nf5rnizVwKzNP+ X-Google-Smtp-Source: AGs4zMa8qNQrSiETk0dhGHpKG0qvIi5RYvFJCDt9AwGuOzMtl8zfdtzxHZDMXbjzytLwuO5F2J97aw== X-Received: by 10.28.173.199 with SMTP id w190mr7066378wme.69.1511045143679; Sat, 18 Nov 2017 14:45:43 -0800 (PST) Received: from localhost (cpc73832-dals21-2-0-cust969.20-2.cable.virginm.net. [81.110.231.202]) by smtp.gmail.com with ESMTPSA id x142sm4652365wme.34.2017.11.18.14.45.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Nov 2017 14:45:43 -0800 (PST) From: Thomas Gummerer To: git@vger.kernel.org Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano , Eric Sunshine , Thomas Gummerer Subject: [PATCH v3 2/3] worktree: make add dwim Date: Sat, 18 Nov 2017 22:47:05 +0000 Message-Id: <20171118224706.13810-3-t.gummerer@gmail.com> X-Mailer: git-send-email 2.15.0.345.gf926f18f3 In-Reply-To: <20171118224706.13810-1-t.gummerer@gmail.com> References: <20171118181103.28354-1-t.gummerer@gmail.com> <20171118224706.13810-1-t.gummerer@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Currently 'git worktree add ', errors out when 'branch' is not a local branch. It has no additional dwim'ing features that one might expect. Make it behave more like 'git checkout ' when the branch doesn't exist locally, but a remote tracking branch uniquely matches the desired branch name, i.e. create a new branch from the remote tracking branch and set the upstream to the remote tracking branch. As 'git worktree add' currently just dies in this situation, there are no backwards compatibility worries when introducing this feature. Signed-off-by: Thomas Gummerer --- Documentation/git-worktree.txt | 7 +++++++ builtin/worktree.c | 15 ++++++++++++++ t/t2025-worktree-add.sh | 46 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index b472acc356..abf48fecb8 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -52,6 +52,13 @@ is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as ``; it is synonymous with `@{-1}`. + +If 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 ) with a matching name, treat as equivalent to +------------ +$ git worktree add -b / +------------ ++ If `` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, a new branch based at HEAD is created automatically, as if `-b $(basename )` was specified. diff --git a/builtin/worktree.c b/builtin/worktree.c index 7b9307aa58..05fc902bcc 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "checkout.h" #include "config.h" #include "builtin.h" #include "dir.h" @@ -386,6 +387,20 @@ static int add(int ac, const char **av, const char *prefix) opts.new_branch = xstrndup(s, n); } + if (ac == 2 && !opts.new_branch && !opts.detach) { + struct object_id oid; + struct commit *commit; + const char *remote; + + commit = lookup_commit_reference_by_name(branch); + if (!commit) + remote = unique_tracking_name(branch, &oid); + if (!commit && remote) { + opts.new_branch = branch; + branch = remote; + } + } + if (opts.new_branch) { struct child_process cp = CHILD_PROCESS_INIT; cp.git_cmd = 1; diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index b5c47ac602..e3fc60dd1c 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -6,6 +6,16 @@ test_description='test git worktree add' . "$TEST_DIRECTORY"/lib-rebase.sh +# Is branch "refs/heads/$1" set to pull from "$2/$3"? +test_branch_upstream () { + printf "%s\n" "$2" "refs/heads/$3" >expect.upstream && + { + git config "branch.$1.remote" && + git config "branch.$1.merge" + } >actual.upstream && + test_cmp expect.upstream actual.upstream +} + test_expect_success 'setup' ' test_commit init ' @@ -314,4 +324,40 @@ test_expect_success 'rename a branch under bisect not allowed' ' test_must_fail git branch -M under-bisect bisect-with-new-name ' +test_expect_success '"add" fails' ' + test_must_fail git worktree add foo non-existent +' + +test_expect_success '"add" dwims' ' + test_when_finished rm -rf repo_upstream && + test_when_finished rm -rf repo_dwim && + test_when_finished rm -rf foo && + git init repo_upstream && + ( + cd repo_upstream && + test_commit upstream_master && + git checkout -b foo && + test_commit a_foo + ) && + git init repo_dwim && + ( + cd repo_dwim && + test_commit dwim_master && + git remote add repo_upstream ../repo_upstream && + 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 + ) && + ( + cd foo && + test_branch_upstream foo repo_upstream foo && + git rev-parse repo_upstream/foo >expect && + git rev-parse foo >actual && + test_cmp expect actual + ) +' + test_done -- 2.15.0.345.gf926f18f3