From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ray Zhang Subject: [PATCH v3] worktree: add: introduce --checkout option Date: Fri, 25 Mar 2016 11:25:37 +0000 Message-ID: <01020153ad85c135-8ca8cff0-9e6f-48ea-89f3-4036814feeca-000000@eu-west-1.amazonses.com> References: <01020153a73bbb70-11a8482f-1a90-49e4-a56c-b311e12a85a2-000000@eu-west-1.amazonses.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Mar 25 12:34:37 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ajQ0i-0004ZJ-JC for gcvg-git-2@plane.gmane.org; Fri, 25 Mar 2016 12:34:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752563AbcCYLed (ORCPT ); Fri, 25 Mar 2016 07:34:33 -0400 Received: from a7-17.smtp-out.eu-west-1.amazonses.com ([54.240.7.17]:51733 "EHLO a7-17.smtp-out.eu-west-1.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752544AbcCYLec (ORCPT ); Fri, 25 Mar 2016 07:34:32 -0400 X-Greylist: delayed 533 seconds by postgrey-1.27 at vger.kernel.org; Fri, 25 Mar 2016 07:34:32 EDT DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ihchhvubuqgjsxyuhssfvqohv7z3u4hn; d=amazonses.com; t=1458905137; h=From:To:Message-ID:In-Reply-To:References:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Date:Feedback-ID; bh=u992guk9P6mDU7/VDQKhooRR4EJdJBcJOGKwQoWgWns=; b=HtsWJmODGBbsDNQFv/fz7v+QUrDf0KWeD/O2Mfh26kv5MFUMaw1dyozkWEK65JsF kDDqtFxjdXCfoCfhkj33wbNykSflhMq8exPx1Cm0Yf2E1s+elzoM+t+taZBkxkFmuvm Qa+ztdthzm303tNNeiW66RGvnAp8y3kkPpS+07mY= In-Reply-To: <01020153a73bbb70-11a8482f-1a90-49e4-a56c-b311e12a85a2-000000@eu-west-1.amazonses.com> X-SES-Outgoing: 2016.03.25-54.240.7.17 Feedback-ID: 1.eu-west-1.YYPRFFOog89kHDDPKvTu4MK67j4wW0z7cAgZtFqQH58=:AmazonSES Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: By adding this option which defaults to true, we can use the corresponding --no-checkout to make some customizations before the checkout, like sparse checkout, etc. Signed-off-by: Ray Zhang --- 1. reword on `--no-checkout` in Documentation/git-worktree.txt 2. update the test for `--no-checkout` 3. add a test for `--checkout` Previous version of this patch:[v2] [v2]: http://article.gmane.org/gmane.comp.version-control.git/289713 --- Documentation/git-worktree.txt | 8 +++++++- builtin/worktree.c | 15 ++++++++++----- t/t2025-worktree-add.sh | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 62c76c1..c2796bb 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -9,7 +9,7 @@ git-worktree - Manage multiple working trees SYNOPSIS -------- [verse] -'git worktree add' [-f] [--detach] [-b ] [] +'git worktree add' [-f] [--detach] [--checkout] [-b ] [] 'git worktree prune' [-n] [-v] [--expire ] 'git worktree list' [--porcelain] @@ -87,6 +87,12 @@ OPTIONS With `add`, detach HEAD in the new working tree. See "DETACHED HEAD" in linkgit:git-checkout[1]. +--[no-]checkout:: + By default, `add` checks out HEAD, however, `--no-checkout` can + be used to suppress checkout in order to make customizations, + such as configuring sparse-checkout. See "Sparse checkout" + in linkgit:git-read-tree[1]. + -n:: --dry-run:: With `prune`, do not remove anything; just report what it would diff --git a/builtin/worktree.c b/builtin/worktree.c index 38b5609..e677cd7 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -21,6 +21,7 @@ static const char * const worktree_usage[] = { struct add_opts { int force; int detach; + int checkout; const char *new_branch; int force_new_branch; }; @@ -284,11 +285,13 @@ static int add_worktree(const char *path, const char *refname, if (ret) goto done; - cp.argv = NULL; - argv_array_clear(&cp.args); - argv_array_pushl(&cp.args, "reset", "--hard", NULL); - cp.env = child_env.argv; - ret = run_command(&cp); + if (opts->checkout) { + cp.argv = NULL; + argv_array_clear(&cp.args); + argv_array_pushl(&cp.args, "reset", "--hard", NULL); + cp.env = child_env.argv; + ret = run_command(&cp); + } if (!ret) { is_junk = 0; free(junk_work_tree); @@ -320,10 +323,12 @@ static int add(int ac, const char **av, const char *prefix) OPT_STRING('B', NULL, &new_branch_force, N_("branch"), N_("create or reset a branch")), OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")), + OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")), OPT_END() }; memset(&opts, 0, sizeof(opts)); + opts.checkout = 1; ac = parse_options(ac, av, prefix, options, worktree_usage, 0); if (!!opts.detach + !!opts.new_branch + !!new_branch_force > 1) die(_("-b, -B, and --detach are mutually exclusive")); diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index cbfa41e..1ff96af 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -213,4 +213,18 @@ test_expect_success 'local clone from linked checkout' ' ( cd here-clone && git fsck ) ' +test_expect_success '"add" worktree with --no-checkout' ' + git worktree add --no-checkout -b swamp swamp && + ls swamp >actual && test_line_count = 0 actual && + ( + cd swamp && git reset --hard && + test_cmp ../init.t init.t + ) +' + +test_expect_success '"add" worktree with --checkout' ' + git worktree add --checkout -b swmap2 swamp2 && + ( cd swamp2 && test_cmp ../init.t init.t ) +' + test_done -- https://github.com/git/git/pull/217