From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: git@vger.kernel.org, Duy Nguyen <pclouds@gmail.com>
Subject: Re: [RFC/PATCH] worktree: replace "checkout --to" with "worktree new"
Date: Tue, 30 Jun 2015 10:13:48 -0700 [thread overview]
Message-ID: <xmqqioa56rw3.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435640202-95945-1-git-send-email-sunshine@sunshineco.com> (Eric Sunshine's message of "Tue, 30 Jun 2015 00:56:42 -0400")
Eric Sunshine <sunshine@sunshineco.com> writes:
> * t2025-checkout-to.sh became t2025-worktree-new.sh. I'm not sure if the
> test number still makes sense or if it should be changed, however, it
> resides alongside its t2026-prune-linked-checkouts.sh counterpart.
You'd need to adjust t7410 as well, perhaps like so:
diff --git a/t/t7410-submodule-checkout-to.sh b/t/t7410-submodule-checkout-to.sh
index 8f30aed..d037e51 100755
--- a/t/t7410-submodule-checkout-to.sh
+++ b/t/t7410-submodule-checkout-to.sh
@@ -33,7 +33,7 @@ rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1
test_expect_success 'checkout main' \
'mkdir default_checkout &&
(cd clone/main &&
- git checkout --to "$base_path/default_checkout/main" "$rev1_hash_main")'
+ git worktree new "$base_path/default_checkout/main" "$rev1_hash_main")'
test_expect_failure 'can see submodule diffs just after checkout' \
'(cd default_checkout/main && git diff --submodule master"^!" | grep "file1 updated")'
@@ -41,7 +41,7 @@ test_expect_failure 'can see submodule diffs just after checkout' \
test_expect_success 'checkout main and initialize independed clones' \
'mkdir fully_cloned_submodule &&
(cd clone/main &&
- git checkout --to "$base_path/fully_cloned_submodule/main" "$rev1_hash_main") &&
+ git worktree new "$base_path/fully_cloned_submodule/main" "$rev1_hash_main") &&
(cd fully_cloned_submodule/main && git submodule update)'
test_expect_success 'can see submodule diffs after independed cloning' \
next prev parent reply other threads:[~2015-06-30 17:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 4:56 [RFC/PATCH] worktree: replace "checkout --to" with "worktree new" Eric Sunshine
2015-06-30 9:23 ` Duy Nguyen
2015-06-30 16:33 ` Junio C Hamano
2015-07-01 10:46 ` Duy Nguyen
2015-06-30 22:02 ` Eric Sunshine
2015-07-01 6:37 ` Eric Sunshine
2015-06-30 17:13 ` Junio C Hamano [this message]
2015-06-30 22:11 ` Eric Sunshine
2015-06-30 22:27 ` Junio C Hamano
2015-07-01 4:48 ` Mikael Magnusson
2015-06-30 22:32 ` Mark Levedahl
2015-07-01 16:53 ` Junio C Hamano
2015-07-01 17:13 ` Eric Sunshine
2015-07-01 17:16 ` Eric Sunshine
2015-07-01 17:32 ` Junio C Hamano
2015-07-01 18:18 ` Eric Sunshine
2015-07-01 18:52 ` Junio C Hamano
2015-07-02 1:07 ` Duy Nguyen
2015-07-02 2:52 ` Eric Sunshine
2015-07-02 12:41 ` Duy Nguyen
2015-07-02 12:50 ` Duy Nguyen
2015-07-02 17:06 ` Eric Sunshine
2015-07-02 22:41 ` Duy Nguyen
2015-07-02 16:59 ` Eric Sunshine
2015-07-02 18:45 ` Eric Sunshine
2015-07-02 19:00 ` Eric Sunshine
2015-07-02 19:19 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqioa56rw3.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=sunshine@sunshineco.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.