Changes since v6:
1. Fix word wrap in commit message.
2. Use 'mkdir -p folder1' since full-checkout already have folder1.
3. Use `--stat` to ignore file creation time differences in unrefreshed
index.
4. In 'diff-files with pathspec outside sparse definition' add
'git diff-files "folder*/a" to show that the result is the same with a
wildcard pathspec.
5. Create an 'ensure_expanded' to handle silent failures.
Shuqi Liang (2):
t1092: add tests for `git diff-files`
diff-files: integrate with sparse index
builtin/diff-files.c | 8 ++
t/perf/p2000-sparse-operations.sh | 2 +
t/t1092-sparse-checkout-compatibility.sh | 98 ++++++++++++++++++++++++
3 files changed, 108 insertions(+)
Range-diff against v6:
1: 2a994e60bc ! 1: e2dcf9921e t1092: add tests for `git diff-files`
@@ Metadata
## Commit message ##
t1092: add tests for `git diff-files`
- 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.
+ 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.
+ 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, make a directory called 'folder1' and
- copy `a` into 'folder1/a'. 'folder1/a' is identical to `a` in the base
- commit. These make 'folder1/a' in the index, while leaving it outside of
- the sparse-checkout definition. Test 'folder1/a'being present on-disk
+ In order to have staged changes outside of the sparse-checkout cone,
+ make a directory called 'folder1' and copy `a` into 'folder1/a'.
+ 'folder1/a' is identical to `a` in the base commit. These make
+ 'folder1/a' in the index, while leaving it outside of the
+ sparse-checkout definition. Test 'folder1/a'being present on-disk
without modifications, then change content inside 'folder1/a' in order
to test 'folder1/a' being present on-disk with modifications.
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'grep sparse direc
+ test_all_match git diff-files deep/*
+'
+
-+test_expect_failure 'diff-files with pathspec outside sparse definition' '
++test_expect_success 'diff-files with pathspec outside sparse definition' '
+ init_repos &&
+
+ test_sparse_match test_must_fail git diff-files folder2/a &&
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'grep sparse direc
+ # Add file to the index but outside of cone for sparse-checkout cases.
+ # Add file to the index without sparse-checkout cases to ensure all have
+ # same output.
-+ run_on_all mkdir folder1 &&
++ run_on_all mkdir -p folder1 &&
+ run_on_all cp a folder1/a &&
+
+ # file present on-disk without modifications
-+ test_all_match git diff-files &&
-+ test_all_match git diff-files folder1/a &&
++ # use `--stat` to ignore file creation time differences in
++ # unrefreshed index
++ test_all_match git diff-files --stat &&
++ test_all_match git diff-files --stat folder1/a &&
++ test_all_match git diff-files --stat "folder*/a" &&
+
+ # file present on-disk with modifications
+ run_on_all ../edit-contents folder1/a &&
+ test_all_match git diff-files &&
-+ test_all_match git diff-files folder1/a
++ test_all_match git diff-files folder1/a &&
++ test_all_match git diff-files "folder*/a"
+'
+
test_done
2: ac730e372d ! 2: fb8edaf583 diff-files: integrate with sparse index
@@ Commit message
<pathspec> contains wildcard that may need a full-index or the
<pathspec> is simply outside of sparse-checkout definition.
- Remove full index requirement for `git diff-files`
- and add test to ensure the index only expanded when necessary
- in `git diff-files`.
+ Remove full index requirement for `git diff-files`.Create an
+ 'ensure_expanded' to handle silent failures. Add test to
+ ensure the index only expanded when necessary in `git diff-files`.
The `p2000` tests demonstrate a ~96% execution time reduction for 'git
diff-files' and a ~97% execution time reduction for 'git diff-files'
@@ builtin/diff-files.c: int cmd_diff_files(int argc, const char **argv, const char
+
+ if (pathspec_needs_expanded_index(the_repository->index, &rev.diffopt.pathspec))
+ ensure_full_index(the_repository->index);
-+
++
result = run_diff_files(&rev, options);
result = diff_result_code(&rev.diffopt, result);
cleanup:
@@ t/perf/p2000-sparse-operations.sh: test_perf_on_all git checkout-index -f --all
test_done
## t/t1092-sparse-checkout-compatibility.sh ##
-@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_failure 'diff-files with pathspec outside sparse definition' '
- test_all_match git diff-files folder1/a
+@@ t/t1092-sparse-checkout-compatibility.sh: ensure_not_expanded () {
+ test_region ! index ensure_full_index trace2.txt
+ }
+
++ensure_expanded () {
++ rm -f trace2.txt &&
++ if test -z "$WITHOUT_UNTRACKED_TXT"
++ then
++ echo >>sparse-index/untracked.txt
++ fi &&
++
++ if test "$1" = "!"
++ then
++ shift &&
++ test_must_fail env \
++ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
++ git -C sparse-index "$@" \
++ >sparse-index-out \
++ 2>sparse-index-error || return 1
++ else
++ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
++ git -C sparse-index "$@" \
++ >sparse-index-out \
++ 2>sparse-index-error || return 1
++ fi &&
++ test_region index ensure_full_index trace2.txt
++}
++
+ test_expect_success 'sparse-index is not expanded' '
+ init_repos &&
+
+@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'diff-files with pathspec outside sparse definition' '
+ test_all_match git diff-files "folder*/a"
'
+test_expect_success 'diff-files pathspec expands index when necessary' '
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_failure 'diff-files with p
+ run_on_all ../edit-contents deep/a &&
+
+ # pathspec that should expand index
-+ ! ensure_not_expanded diff-files "*/a" &&
-+ test_must_be_empty sparse-index-err &&
-+
-+ ! ensure_not_expanded diff-files "**a" &&
-+ test_must_be_empty sparse-index-err
++ ensure_expanded diff-files "*/a" &&
++ ensure_expanded diff-files "**a"
+'
+
+test_expect_success 'sparse index is not expanded: diff-files' 'Shuqi Liang <cheskaqiqi@gmail.com>