From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Sep 2011 17:19:57 +0000 (-0700)
Subject: Merge branch 'jl/maint-fetch-submodule-check-fix' into maint
X-Git-Tag: v1.7.6.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8702fee6171abb2e353499fa0cecba90ad5f277f?hp=-c

Merge branch 'jl/maint-fetch-submodule-check-fix' into maint

* jl/maint-fetch-submodule-check-fix:
fetch: skip on-demand checking when no submodules are configured
---

8702fee6171abb2e353499fa0cecba90ad5f277f
diff --combined submodule.c
index 1ba9646d34,e0d5dcfedd..b648927509
--- a/submodule.c
+++ b/submodule.c
@@@ -373,6 -373,10 +373,10 @@@ void check_for_new_submodule_commits(un
  	const char *argv[] = {NULL, NULL, "--not", "--all", NULL};
  	int argc = ARRAY_SIZE(argv) - 1;
  
+ 	/* No need to check if there are no submodules configured */
+ 	if (!config_name_for_path.nr)
+ 		return;
+ 
  	init_revisions(&rev, NULL);
  	argv[1] = xstrdup(sha1_to_hex(new_sha1));
  	setup_revisions(argc, argv, &rev, NULL);
@@@ -388,7 -392,6 +392,7 @@@
  		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)