kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

grep: fix worktree case in submodules 

Running git-grep with --recurse-submodules results in a cached grep for
the submodules even when --cached is not used. This makes all
modifications in submodules' tracked files be always ignored when
grepping. Solve that making git-grep respect the cached option when
invoking grep_cache() inside grep_submodule(). Also, add tests to
ensure that the desired behavior is performed.

Reported-by: Daniel Zaoui <jackdanielz@eyomi.org>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matheus Tavares 2019-07-30 13:53:27 -03:00 committed by Junio C Hamano
parent 1feeaaf26b
commit 6a289d45c0
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/grep.c
View File

@ -403,7 +403,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
static int grep_submodule(struct grep_opt *opt, static int grep_submodule(struct grep_opt *opt,
const struct pathspec *pathspec, const struct pathspec *pathspec,
const struct object_id *oid, const struct object_id *oid,
const char *filename, const char *path) const char *filename, const char *path, int cached)
{ {
struct repository subrepo; struct repository subrepo;
struct repository *superproject = opt->repo; struct repository *superproject = opt->repo;
@ -474,7 +474,7 @@ static int grep_submodule(struct grep_opt *opt,
strbuf_release(&base); strbuf_release(&base);
free(data); free(data);
} else { } else {
hit = grep_cache(&subopt, pathspec, 1); hit = grep_cache(&subopt, pathspec, cached);
} }


repo_clear(&subrepo); repo_clear(&subrepo);
@ -522,7 +522,8 @@ static int grep_cache(struct grep_opt *opt,
} }
} else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) && } else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
submodule_path_match(repo->index, pathspec, name.buf, NULL)) { submodule_path_match(repo->index, pathspec, name.buf, NULL)) {
hit |= grep_submodule(opt, pathspec, NULL, ce->name, ce->name); hit |= grep_submodule(opt, pathspec, NULL, ce->name,
ce->name, cached);
} else { } else {
continue; continue;
} }
@ -597,7 +598,8 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
free(data); free(data);
} else if (recurse_submodules && S_ISGITLINK(entry.mode)) { } else if (recurse_submodules && S_ISGITLINK(entry.mode)) {
hit |= grep_submodule(opt, pathspec, &entry.oid, hit |= grep_submodule(opt, pathspec, &entry.oid,
base->buf, base->buf + tn_len); base->buf, base->buf + tn_len,
1); /* ignored */
} }


strbuf_setlen(base, old_baselen); strbuf_setlen(base, old_baselen);

21
t/t7814-grep-recurse-submodules.sh
View File

@ -392,4 +392,25 @@ test_expect_success 'grep --recurse-submodules with submodules without .gitmodul
test_cmp expect actual test_cmp expect actual
' '


reset_and_clean () {
git reset --hard &&
git clean -fd &&
git submodule foreach --recursive 'git reset --hard' &&
git submodule foreach --recursive 'git clean -fd'
}

test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
reset_and_clean &&
echo "A modified line in submodule" >>submodule/a &&
echo "submodule/a:A modified line in submodule" >expect &&
git grep --recurse-submodules "A modified line in submodule" >actual &&
test_cmp expect actual
'

test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
reset_and_clean &&
echo "A modified line in submodule" >>submodule/a &&
test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
test_must_be_empty actual
'
test_done test_done