[PATCH] t7012: Implement test for git-checkout

[PATCH] t7012: Implement test for git-checkout

[Chhatoi Pritam Baral]

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(-)

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

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

[Torsten Bögershausen]

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
> 

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

[Eric Sunshine]

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

> 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