mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
add: update --chmod to skip sparse paths
We added checks for path_in_sparse_checkout() to portions of 'git add' that add warnings and prevent staging a modification, but we skipped the --chmod mode. Update chmod_pathspec() to ignore cache entries whose path is outside of the sparse-checkout cone (unless --sparse is provided). Add a test in t3705. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0299a69694
commit
63b60b3add
|
@ -47,7 +47,9 @@ static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only)
|
||||||
struct cache_entry *ce = active_cache[i];
|
struct cache_entry *ce = active_cache[i];
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (!include_sparse && ce_skip_worktree(ce))
|
if (!include_sparse &&
|
||||||
|
(ce_skip_worktree(ce) ||
|
||||||
|
!path_in_sparse_checkout(ce->name, &the_index)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
|
if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
|
||||||
|
|
|
@ -169,11 +169,19 @@ test_expect_success 'git add fails outside of sparse-checkout definition' '
|
||||||
test_must_fail git add sparse_entry &&
|
test_must_fail git add sparse_entry &&
|
||||||
test_sparse_entry_unstaged &&
|
test_sparse_entry_unstaged &&
|
||||||
|
|
||||||
|
test_must_fail git add --chmod=+x sparse_entry &&
|
||||||
|
test_sparse_entry_unstaged &&
|
||||||
|
|
||||||
# Avoid munging CRLFs to avoid an error message
|
# Avoid munging CRLFs to avoid an error message
|
||||||
git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
|
git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
|
||||||
test_must_be_empty stderr &&
|
test_must_be_empty stderr &&
|
||||||
test-tool read-cache --table >actual &&
|
test-tool read-cache --table >actual &&
|
||||||
grep "^100644 blob.*sparse_entry\$" actual
|
grep "^100644 blob.*sparse_entry\$" actual &&
|
||||||
|
|
||||||
|
git add --sparse --chmod=+x sparse_entry 2>stderr &&
|
||||||
|
test_must_be_empty stderr &&
|
||||||
|
test-tool read-cache --table >actual &&
|
||||||
|
grep "^100755 blob.*sparse_entry\$" actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'add obeys advice.updateSparsePath' '
|
test_expect_success 'add obeys advice.updateSparsePath' '
|
||||||
|
|
Loading…
Reference in a new issue