t7012: Implement test for git-checkout
PATCH v2 1/1 t7012: Implement test for git-checkout
Previously a TODO; add a test for git-checkout skipping a file with the skip-worktree bit set.
---
This is a microproject for my GSoC '16 application.
Thanks, Torsten, for pointing out my mistakes. :)
It was my first time sending patches in mail (and not as attachments).
t/t7012-skip-worktree-writing.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
(quoted diff) +0 -0
b/t/t7012-skip-worktree-writing.sh
index 9ceaa40..276f076 100755
t/t7012-skip-worktree-writing.sh +11 -1
@@ -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
Signature · 1 line
2.7.4
Quoted 24 lines · Chhatoi Pritam Baral
Previously a TODO; add a test for git-checkout skipping a file with the skip-worktree bit set.
Signed-off-by Chhatoi Pritam Baral <[email protected]>---
This is a microproject for my GSoC '16 application.
Thanks, Torsten, for pointing out my mistakes. :)
It was my first time sending patches in mail (and not as attachments).t/t7012-skip-worktree-writing.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)t/t7012-skip-worktree-writing.sh +0
-1@@ -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
t/t7012-skip-worktree-writing.sh test_expect_success 'git-clean, dirty case' ' · line 153
Quoted 10 lines
t/t7012-skip-worktree-writing.sh +10
-0+ +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
As Eric mentioned on another thread, test_must_fail needs replacing with '!'.
I'll just wait a while, let the two thread collect responses before I begin a v3 thread.
Quoted 2 lines
t/t7012-skip-worktree-writing.sh +1
-0+' test_done