git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chhatoi Pritam Baral <chhatoipritam@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH v2] t7012: Implement test for git-checkout
Date: Sat, 26 Mar 2016 05:04:07 +0530	[thread overview]
Message-ID: <56F5CAEF.9070906@gmail.com> (raw)

Previously a TODO; add a test for git-checkout skipping a
file with the skip-worktree bit set.

Signed-off-by: Chhatoi Pritam Baral <chhatoipritam@gmail.com>
---

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

diff --git a/t/t7012-skip-worktree-writing.sh
b/t/t7012-skip-worktree-writing.sh
index 9ceaa40..276f076 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

             reply	other threads:[~2016-03-25 23:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-25 23:34 Chhatoi Pritam Baral [this message]
2016-03-25 23:39 ` [PATCH v2] t7012: Implement test for git-checkout Chhatoi Pritam Baral

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=56F5CAEF.9070906@gmail.com \
    --to=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).