summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2021-07-29 14:52:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-29 19:36:34 (GMT)
commit939fa07582a2c9455e71f599263e2dcbe1d655b5 (patch)
treed197c98af49664f502bf69ee37e8bb39eaa6aed6
parent4eaffd81a5fbffc692f1044374a3a16689fc37a5 (diff)
downloadgit-939fa07582a2c9455e71f599263e2dcbe1d655b5.zip
git-939fa07582a2c9455e71f599263e2dcbe1d655b5.tar.gz
git-939fa07582a2c9455e71f599263e2dcbe1d655b5.tar.bz2
add: ignore outside the sparse-checkout in refresh()
Since b243012 (refresh_index(): add flag to ignore SKIP_WORKTREE entries, 2021-04-08), 'git add --refresh <path>' will output a warning message when the path is outside the sparse-checkout definition. The implementation of this warning happened in parallel with the sparse-index work to add ensure_full_index() calls throughout the codebase. Update this loop to have the proper logic that checks to see if the pathspec is outside the sparse-checkout definition. This avoids the need to expand the sparse directory entry and determine if the path is tracked, untracked, or ignored. We simply avoid updating the stat() information because there isn't even an entry that matches the path! Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/add.c10
-rwxr-xr-xt/t1092-sparse-checkout-compatibility.sh6
2 files changed, 10 insertions, 6 deletions
diff --git a/builtin/add.c b/builtin/add.c
index c76e6dd..d512ece 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -192,13 +192,21 @@ static int refresh(int verbose, const struct pathspec *pathspec)
struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
int flags = REFRESH_IGNORE_SKIP_WORKTREE |
(verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET);
+ struct pattern_list pl = { 0 };
+ int sparse_checkout_enabled = !get_sparse_checkout_patterns(&pl);
seen = xcalloc(pathspec->nr, 1);
refresh_index(&the_index, flags, pathspec, seen,
_("Unstaged changes after refreshing the index:"));
for (i = 0; i < pathspec->nr; i++) {
if (!seen[i]) {
- if (matches_skip_worktree(pathspec, i, &skip_worktree_seen)) {
+ const char *path = pathspec->items[i].original;
+ int dtype = DT_REG;
+
+ if (matches_skip_worktree(pathspec, i, &skip_worktree_seen) ||
+ (sparse_checkout_enabled &&
+ !path_matches_pattern_list(path, strlen(path), NULL,
+ &dtype, &pl, &the_index))) {
string_list_append(&only_match_skip_worktree,
pathspec->items[i].original);
} else {
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index dee20db..ddc86bb 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -339,11 +339,7 @@ test_expect_success 'status/add: outside sparse cone' '
# Adding the path outside of the sparse-checkout cone should fail.
test_sparse_match test_must_fail git add folder1/a &&
-
- test_must_fail git -C sparse-checkout add --refresh folder1/a 2>sparse-checkout-err &&
- test_must_fail git -C sparse-index add --refresh folder1/a 2>sparse-index-err &&
- # NEEDSWORK: A sparse index changes the error message.
- ! test_cmp sparse-checkout-err sparse-index-err &&
+ test_sparse_match test_must_fail git add --refresh folder1/a &&
# NEEDSWORK: Adding a newly-tracked file outside the cone succeeds
test_sparse_match git add folder1/new &&