builtin/fetch.c: respect 'submodule.recurse' option

stefanbeller · gitster · commit 58f4203e7db2 · 2017-06-01T10:36:36.000+09:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -73,6 +73,13 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
 		fetch_prune_config = git_config_bool(k, v);
 		return 0;
 	}
+
+	if (!strcmp(k, "submodule.recurse")) {
+		int r = git_config_bool(k, v) ?
+			RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
+		recurse_submodules = r;
+	}
+
 	return git_default_config(k, v, cb);
 }
 
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
@@ -71,6 +71,16 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" '
 	test_i18ncmp expect.err actual.err
 '
 
+test_expect_success "submodule.recurse option triggers recursive fetch" '
+	add_upstream_commit &&
+	(
+		cd downstream &&
+		git -c submodule.recurse fetch >../actual.out 2>../actual.err
+	) &&
+	test_must_be_empty actual.out &&
+	test_i18ncmp expect.err actual.err
+'
+
 test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
 	add_upstream_commit &&
 	(

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,13 @@ static int git_fetch_config(const char k, const char v, void *cb)`
`73`	`73`	`fetch_prune_config = git_config_bool(k, v);`
`74`	`74`	`return 0;`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ if (!strcmp(k, "submodule.recurse")) {`
	`78`	`+ int r = git_config_bool(k, v) ?`
	`79`	`+ RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;`
	`80`	`+ recurse_submodules = r;`
	`81`	`+ }`
	`82`	`+`
`76`	`83`	`return git_default_config(k, v, cb);`
`77`	`84`	`}`
`78`	`85`