summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-01 14:44:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-01 14:44:17 -0700
commit62607e481391d1c2a76ba36fb24e4ec83403395a (patch)
treee35fcb115e877a67f212efd37c5a53f70548da86 /submodule.c
parent6124690d5f004404325d5d41f7e4c8a78a08451e (diff)
parentea2d325b88562a074337a8bd30c37d3405c24fae (diff)
downloadgit-62607e481391d1c2a76ba36fb24e4ec83403395a.tar.gz
Merge branch 'jl/maint-fetch-recursive-fix' into maint
* jl/maint-fetch-recursive-fix: fetch: Also fetch submodules in subdirectories in on-demand mode
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c
index b6dec70bd1..1ba9646d34 100644
--- a/submodule.c
+++ b/submodule.c
@@ -388,6 +388,7 @@ void check_for_new_submodule_commits(unsigned char new_sha1[20])
while (parent) {
struct diff_options diff_opts;
diff_setup(&diff_opts);
+ DIFF_OPT_SET(&diff_opts, RECURSIVE);
diff_opts.output_format |= DIFF_FORMAT_CALLBACK;
diff_opts.format_callback = submodule_collect_changed_cb;
if (diff_setup_done(&diff_opts) < 0)