development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

add: make --chmod and --renormalize honor sparse checkouts

Browse source 
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matheus Tavares 2021-04-08 17:41:24 -03:00 committed by Junio C Hamano
parent 6594afc3cc
commit d73dbafc2c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
builtin/add.c
View file

@ -46,6 +46,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 (ce_skip_worktree(ce))
continue;
if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL)) if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
continue; continue;
@ -144,6 +147,8 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
for (i = 0; i < active_nr; i++) { for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = active_cache[i];
if (ce_skip_worktree(ce))
continue;
if (ce_stage(ce)) if (ce_stage(ce))
continue; /* do not touch unmerged paths */ continue; /* do not touch unmerged paths */
if (!S_ISREG(ce->ce_mode) && !S_ISLNK(ce->ce_mode)) if (!S_ISREG(ce->ce_mode) && !S_ISLNK(ce->ce_mode))

4
t/t3705-add-sparse-checkout.sh
View file

@ -78,14 +78,14 @@ test_expect_success 'git add --refresh does not update sparse entries' '
test_cmp before after test_cmp before after
' '
test_expect_failure 'git add --chmod does not update sparse entries' ' test_expect_success 'git add --chmod does not update sparse entries' '
setup_sparse_entry && setup_sparse_entry &&
git add --chmod=+x sparse_entry && git add --chmod=+x sparse_entry &&
test_sparse_entry_unchanged && test_sparse_entry_unchanged &&
! test -x sparse_entry ! test -x sparse_entry
' '
test_expect_failure 'git add --renormalize does not update sparse entries' ' test_expect_success 'git add --renormalize does not update sparse entries' '
test_config core.autocrlf false && test_config core.autocrlf false &&
setup_sparse_entry "LINEONE\r\nLINETWO\r\n" && setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
echo "sparse_entry text=auto" >.gitattributes && echo "sparse_entry text=auto" >.gitattributes &&