From: Shuqi Liang <cheskaqiqi@gmail.com>
To: git@vger.kernel.org
Cc: Shuqi Liang <cheskaqiqi@gmail.com>,
vdye@github.com, derrickstolee@github.com
Subject: [PATCH v2 1/2] t1092: add tests for `git diff-files`
Date: Tue, 7 Mar 2023 01:45:05 -0500 [thread overview]
Message-ID: <20230307064506.76663-2-cheskaqiqi@gmail.com> (raw)
In-Reply-To: <20230307064506.76663-1-cheskaqiqi@gmail.com>
Before integrating the 'git diff-files' builtin
with the sparse index feature, add tests to
t1092-sparse-checkout-compatibility.sh to ensure it currently works
with sparse-checkout and will still work with sparse index
after that integration.
When adding tests against a sparse-checkout
definition, we test two modes: all changes are
within the sparse-checkout cone and some changes are outside
the sparse-checkout cone.
In order to have staged changes outside of
the sparse-checkout cone, create a 'newdirectory/testfile' and
add it to the index, while leaving it outside of
the sparse-checkout definition.Test 'newdirectory/testfile'
being present on-disk without modifications, then change content inside
'newdirectory/testfile' in order to test 'newdirectory/testfile'
being present on-disk with modifications.
Signed-off-by: Shuqi Liang <cheskaqiqi@gmail.com>
---
t/t1092-sparse-checkout-compatibility.sh | 38 ++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 801919009e..9382428352 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -2055,4 +2055,42 @@ test_expect_success 'grep sparse directory within submodules' '
test_cmp actual expect
'
+test_expect_success 'diff-files with pathspec inside sparse definition' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ run_on_all ../edit-contents deep/a &&
+
+ test_all_match git diff-files &&
+ test_all_match git diff-files deep/a &&
+ test_all_match git diff-files --find-object=HEAD:a
+'
+
+test_expect_success 'diff-files with pathspec outside sparse definition' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+
+ #add file to the index but outside of cone
+ run_on_sparse mkdir newdirectory &&
+ run_on_sparse ../edit-contents newdirectory/testfile &&
+ test_sparse_match git add --sparse newdirectory/testfile &&
+
+ #file present on-disk without modifications
+ test_sparse_match git diff-files &&
+ test_sparse_match git diff-files newdirectory/testfile &&
+ test_sparse_match test_must_fail git diff-files --find-object=HEAD:testfile &&
+
+ #file present on-disk with modifications
+ run_on_sparse ../edit-contents newdirectory/testfile &&
+ test_sparse_match git diff-files &&
+ test_sparse_match git diff-files newdirectory/testfile &&
+ test_sparse_match test_must_fail git diff-files --find-object=HEAD:testfile
+'
+
test_done
--
2.39.0
next prev parent reply other threads:[~2023-03-07 6:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 6:45 [PATCH v2 0/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-07 6:45 ` Shuqi Liang [this message]
2023-03-07 6:45 ` [PATCH v2 2/2] " Shuqi Liang
-- strict thread matches above, loose matches on Subject: below --
2023-03-04 2:57 [RFC][PATCH] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-07 6:58 ` [PATCH v2 0/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-07 6:58 ` [PATCH v2 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-07 18:53 ` Junio C Hamano
2023-03-08 22:04 ` Shuqi Liang
2023-03-08 22:40 ` Junio C Hamano
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=20230307064506.76663-2-cheskaqiqi@gmail.com \
--to=cheskaqiqi@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=vdye@github.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).