diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-01 23:44:17 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-01 23:44:17 +0200 |
commit | 62607e481391d1c2a76ba36fb24e4ec83403395a (patch) | |
tree | e35fcb115e877a67f212efd37c5a53f70548da86 /submodule.c | |
parent | Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maint (diff) | |
parent | fetch: Also fetch submodules in subdirectories in on-demand mode (diff) | |
download | git-62607e481391d1c2a76ba36fb24e4ec83403395a.tar.xz git-62607e481391d1c2a76ba36fb24e4ec83403395a.zip |
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.c | 1 |
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) |