summaryrefslogtreecommitdiffstats
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-19 00:12:11 +0100
committerJunio C Hamano <gitster@pobox.com>2017-01-19 00:12:11 +0100
commit55d128ae06b7b82f867961b677984620612a201c (patch)
tree5628d92c5a897c1738ae99b360d303a2ac62409e /grep.h
parentMerge git://ozlabs.org/~paulus/gitk (diff)
parentgrep: search history of moved submodules (diff)
downloadgit-55d128ae06b7b82f867961b677984620612a201c.tar.xz
git-55d128ae06b7b82f867961b677984620612a201c.zip
Merge branch 'bw/grep-recurse-submodules'
"git grep" has been taught to optionally recurse into submodules. * bw/grep-recurse-submodules: grep: search history of moved submodules grep: enable recurse-submodules to work on <tree> objects grep: optionally recurse into submodules grep: add submodules as a grep source type submodules: load gitmodules file from commit sha1 submodules: add helper to determine if a submodule is initialized submodules: add helper to determine if a submodule is populated real_path: canonicalize directory separators in root parts real_path: have callers use real_pathdup and strbuf_realpath real_path: create real_pathdup real_path: convert real_path_internal to strbuf_realpath real_path: resolve symlinks by hand
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index 5856a23e46..267534ca24 100644
--- a/grep.h
+++ b/grep.h
@@ -161,6 +161,7 @@ struct grep_source {
GREP_SOURCE_SHA1,
GREP_SOURCE_FILE,
GREP_SOURCE_BUF,
+ GREP_SOURCE_SUBMODULE,
} type;
void *identifier;