threads / patch / 41826

patcht7012: Implement test for git-checkout

Subject: [PATCH] t7012: Implement test for git-checkout

## tl;dr

3 messages between Mar 25, 2016 and Mar 25, 2016. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Chhatoi Pritam Baral· Mar 25, 2016, 17:36 UTC · lore

Previously a TODO, this patch adds 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.

Signed-off-by: Chhatoi Pritam Baral <chhatoipritam@gmail.com>
---
 t/t7012-skip-worktree-writing.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Show changes to t/t7012-skip-worktree-writing.sh +11 −1

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 &&
+	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

-- 
2.7.4

Torsten Bögershausen· Mar 25, 2016, 22:32 UTC · re: Chhatoi Pritam Baral · lore

Re: [PATCH] t7012: Implement test for git-checkout

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.

Show 16 quoted lines

>  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 &&

Show 10 quoted lines

> +	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
>

Eric Sunshine· Mar 25, 2016, 23:29 UTC · re: Chhatoi Pritam Baral · lore

Re: [PATCH] t7012: Implement test for git-checkout

On Fri, Mar 25, 2016 at 1:36 PM, Chhatoi Pritam Baral <chhatoipritam@gmail.com> wrote:

> Previously a TODO, this patch adds a test for git-checkout skipping a
> file with the skip-worktree bit set.

In addition to Torsten's comments...

Show 17 quoted lines

> diff --git 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 &&
> +       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_must_fail is for git commands; for system commands, just use '!' (t/README explains the rationale).

    ! grep -q dirty 2

> +'
>   test_done