From: Eric Sunshine <sunshine@sunshineco.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] checkout: teach --worktree
Date: Sat, 13 Jun 2020 22:51:47 -0400 [thread overview]
Message-ID: <CAPig+cQ_G+N=mYqO+=7UaAYft27MhZ2_3v8=QzYpDn5hQySp+A@mail.gmail.com> (raw)
In-Reply-To: <d10cb03dd8ce00cb6033c61ff9b9b30bbf5f9c89.1592058281.git.liu.denton@gmail.com>
On Sat, Jun 13, 2020 at 10:25 AM Denton Liu <liu.denton@gmail.com> wrote:
> [...]
> Teach `git checkout --worktree`, allowing users to checkout files
> directly into the worktree without affecting the index.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
> @@ -264,6 +266,12 @@ When switching branches with `--merge`, staged changes may be lost.
> +-W::
> +--worktree::
> + When writing contents, only modify files in the worktree. Do not
> + modify the index. This option is essentially a no-op when used
> + without a `<tree-ish>`.
Why a no-op rather than actually diagnosing that --worktree makes no
sense in that case and erroring out?
> diff --git a/t/t2028-checkout-worktree.sh b/t/t2028-checkout-worktree.sh
> @@ -0,0 +1,51 @@
> +test_expect_success 'checkout --worktree on a commit' '
> + test_when_finished "git reset --hard tip" &&
> + git diff HEAD HEAD~ >expect &&
> + git checkout --worktree HEAD~ file1 &&
> + git diff >actual &&
> + test_cmp expect actual &&
> + git diff --cached --exit-code &&
Would the intent be clearer if you used 'test_expect_code' here?
test_expect_code 0 git diff --cached --exit-code &&
Same question for remaining tests.
next prev parent reply other threads:[~2020-06-14 2:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-13 14:25 [PATCH] checkout: teach --worktree Denton Liu
2020-06-14 2:51 ` Eric Sunshine [this message]
2020-06-14 7:44 ` Denton Liu
2020-06-14 8:02 ` Denton Liu
2020-06-14 21:37 ` Junio C Hamano
2020-06-14 8:49 ` [PATCH v2] " Denton Liu
2020-06-16 16:01 ` Phillip Wood
2020-06-23 15:55 ` Denton Liu
2020-06-24 10:20 ` Phillip Wood
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='CAPig+cQ_G+N=mYqO+=7UaAYft27MhZ2_3v8=QzYpDn5hQySp+A@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@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.
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 NNTP newsgroup(s).