From: "Torsten Bögershausen" <tboegi@web.de>
To: Chhatoi Pritam Baral <chhatoipritam@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] t7012: Implement test for git-checkout
Date: Fri, 25 Mar 2016 23:32:52 +0100 [thread overview]
Message-ID: <56F5BC94.1070903@web.de> (raw)
In-Reply-To: <56F57714.4050708@gmail.com>
On 2016-03-25 18.36, Chhatoi Pritam Baral wrote:
Thanks for working on Git.
Some comments inline.
> Previously a TODO, this patch adds a test for git-checkout skipping a
> file with the
> skip-worktree bit set.
Micro-nit: the "this patch ..." may be written shorter:
> Previously a TODO, add a test for git-checkout skipping a
> file with the skip-worktree bit set.
>
> I'm doing this as a microproject for my GSoC '16 application.
This info is good to have, but doesn't need to stay forever in the
commit message. It may be below (see XXX)
>
> Signed-off-by: Chhatoi Pritam Baral <chhatoipritam@gmail.com>
> ---
XXX Add additional info here.
> t/t7012-skip-worktree-writing.sh | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/t/t7012-skip-worktree-writing.sh
> b/t/t7012-skip-worktree-writing.sh
> index 9ceaa40..d5b42d6 100755
> --- a/t/t7012-skip-worktree-writing.sh
> +++ b/t/t7012-skip-worktree-writing.sh
> @@ -141,6 +141,16 @@ test_expect_success 'git-clean, dirty case' '
> #TODO test_expect_failure 'git-apply removes file' false
> #TODO test_expect_failure 'git-mv to skip-worktree' false
> #TODO test_expect_failure 'git-mv from skip-worktree' false
> -#TODO test_expect_failure 'git-checkout' false
> +
> +test_expect_success 'git-checkout ignores skip-worktree file' '
> + echo > 1 &&
Style: No space after the '>', like this:
echo >1 &&
> + git commit -m "Add files" &&
> + echo dirty > 1 &&
> + echo dirty > 2 &&
> + git update-index --skip-worktree 1 &&
> + git checkout -- . &&
> + grep -q dirty 1 &&
> + test_must_fail grep -q dirty 2
> +'
> test_done
>
next prev parent reply other threads:[~2016-03-25 22:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-25 17:36 [PATCH] t7012: Implement test for git-checkout Chhatoi Pritam Baral
2016-03-25 22:32 ` Torsten Bögershausen [this message]
2016-03-25 23:29 ` 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=56F5BC94.1070903@web.de \
--to=tboegi@web.de \
--cc=chhatoipritam@gmail.com \
--cc=git@vger.kernel.org \
/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).