From: Junio C Hamano <gitster@pobox.com>
To: Ray Zhang <zhanglei002@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4] worktree: add: introduce --checkout option
Date: Mon, 28 Mar 2016 10:40:52 -0700 [thread overview]
Message-ID: <xmqq8u12zejf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <01020153bcda5e6c-2bae9b68-6669-4f29-a512-136c42722001-000000@eu-west-1.amazonses.com> (Ray Zhang's message of "Mon, 28 Mar 2016 10:52:21 +0000")
Ray Zhang <zhanglei002@gmail.com> writes:
> 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.
>
> Helped-by: Eric Sunshine <sunshine@sunshineco.com>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
> Signed-off-by: Ray Zhang <zhanglei002@gmail.com>
> ---
Thanks. Will queue.
> diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
> index cbfa41e..472b811 100755
> --- a/t/t2025-worktree-add.sh
> +++ b/t/t2025-worktree-add.sh
> @@ -213,4 +213,17 @@ 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 &&
The remainder of the test (both existing and added parts)
seems to only care about init.t; running "ls swamp" feels
somewhat inconsistent. We could replace the two lines with
! test -e swamp/init.t
to address this, but I do not think it is worth a patch churn.
> + git -C swamp reset --hard &&
> + test_cmp init.t swamp/init.t
> +'
> +test_expect_success '"add" worktree with --checkout' '
> + git worktree add --checkout -b swmap2 swamp2 &&
> + test_cmp init.t swamp2/init.t
> +'
> +
> test_done
next prev parent reply other threads:[~2016-03-28 17:41 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 15:08 [PATCH] add option -n (--no-checkout) to git-worktree add Ray Zhang
2016-03-23 15:49 ` Eric Sunshine
2016-03-23 15:51 ` Junio C Hamano
2016-03-23 17:43 ` Eric Sunshine
2016-03-24 6:07 ` [PATCH v2] worktree: add: introduce --checkout option Ray Zhang
2016-03-24 9:16 ` Duy Nguyen
2016-03-24 9:52 ` Zhang Lei
2016-03-25 1:22 ` Eric Sunshine
2016-03-25 1:29 ` Eric Sunshine
2016-03-25 1:49 ` Duy Nguyen
2016-03-25 11:31 ` Zhang Lei
2016-03-25 11:41 ` Duy Nguyen
2016-03-25 12:06 ` Zhang Lei
2016-03-25 12:15 ` Duy Nguyen
2016-03-25 13:02 ` Mike Rappazzo
2016-03-25 1:18 ` Eric Sunshine
2016-03-25 11:25 ` [PATCH v3] " Ray Zhang
2016-03-27 19:49 ` Eric Sunshine
2016-03-28 10:52 ` [PATCH v4] " Ray Zhang
2016-03-28 17:40 ` Junio C Hamano [this message]
2016-03-29 10:11 ` [PATCH v5] " Ray Zhang
2016-03-29 10:54 ` John Keeping
2016-03-29 18:04 ` Eric Sunshine
2016-03-29 20:15 ` John Keeping
2016-03-29 20:28 ` Junio C Hamano
2016-03-29 19:20 ` Eric Sunshine
2016-03-30 3:11 ` Zhang Lei
2016-03-30 17:59 ` Eric Sunshine
[not found] ` <CAPig+cSkE-xoaXnXHZHB4xz=ehCR973PaKbZJRyiTvHWn0AyoA@mail.gmail.com>
2016-03-29 18:43 ` [PATCH v4] " Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8u12zejf.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=zhanglei002@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).