summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:11 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:11 -0800
commit55d128ae06b7b82f867961b677984620612a201c (patch)
tree5628d92c5a897c1738ae99b360d303a2ac62409e /submodule.h
parentffac48d093d4b518a0cc0e8bf1b7cb53e0c3d7a2 (diff)
parente6fac7f3d3e313a93fe9b1243917669267b33153 (diff)
downloadgit-55d128ae06b7b82f867961b677984620612a201c.tar.gz
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 'submodule.h')
-rw-r--r--submodule.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h
index b7576d6f43..1ccaf0e6ba 100644
--- a/submodule.h
+++ b/submodule.h
@@ -38,6 +38,9 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
const char *path);
int submodule_config(const char *var, const char *value, void *cb);
void gitmodules_config(void);
+extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
+extern int is_submodule_initialized(const char *path);
+extern int is_submodule_populated(const char *path);
int parse_submodule_update_strategy(const char *value,
struct submodule_update_strategy *dst);
const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);