diff options
-rw-r--r-- | dir.c | 4 | ||||
-rwxr-xr-x | t/t1011-read-tree-sparse-checkout.sh | 8 |
2 files changed, 9 insertions, 3 deletions
@@ -1013,6 +1013,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname, { struct exclude *exc = NULL; /* undecided */ int i, maybe_descend = 0; + const char *stuck = ""; if (!el->nr) return NULL; /* undefined */ @@ -1032,6 +1033,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname, if (*dtype == DT_UNKNOWN) *dtype = get_dtype(NULL, pathname, pathlen); if (match_sticky(x, pathname, pathlen, *dtype)) { + stuck = " (stuck)"; exc = x; break; } @@ -1101,7 +1103,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname, trace_printf_key(&trace_exclude, "exclude: %.*s vs %s at line %d => %s%s\n", pathlen, pathname, exc->pattern, exc->srcpos, exc->flags & EXC_FLAG_NEGATIVE ? "no" : "yes", - exc->sticky_paths.nr ? " (stuck)" : ""); + stuck); return exc; } diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index ecc5e930ac..f0b856f14c 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -287,10 +287,14 @@ test_expect_success 'sparse checkout and dir.c sticky bits' ' !one/hideme EOF git config core.sparsecheckout true && - git checkout && + GIT_TRACE_EXCLUDE=2 git checkout 2>&1 | grep stuck >stuck-list && test_path_is_missing one/hideme && test_path_is_file one/showme && - test_path_is_file two/showme + test_path_is_file two/showme && + cat >expected <<-\EOF && + exclude: one/showme vs /* at line 1 => yes (stuck) + EOF + test_cmp expected stuck-list ) ' |