fetch-pack: move code to report unmatched refs to a function

mattmccutchen · gitster · commit e860d96bf89f · 2017-03-02T11:12:53.000-08:00
Prepare to reuse this code in transport.c for "git fetch".

While we're here, internationalize the existing error message.

Signed-off-by: Matt McCutchen &lt;matt@mattmccutchen.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
@@ -219,12 +219,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 	 * remote no-such-ref' would silently succeed without issuing
 	 * an error.
 	 */
-	for (i = 0; i < nr_sought; i++) {
-		if (!sought[i] || sought[i]->matched)
-			continue;
-		error("no such remote ref %s", sought[i]->name);
-		ret = 1;
-	}
+	ret |= report_unmatched_refs(sought, nr_sought);
 
 	while (ref) {
 		printf("%s %s\n",
diff --git a/fetch-pack.c b/fetch-pack.c
@@ -1094,3 +1094,16 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 	clear_shallow_info(&si);
 	return ref_cpy;
 }
+
+int report_unmatched_refs(struct ref **sought, int nr_sought)
+{
+	int i, ret = 0;
+
+	for (i = 0; i < nr_sought; i++) {
+		if (!sought[i] || sought[i]->matched)
+			continue;
+		error(_("no such remote ref %s"), sought[i]->name);
+		ret = 1;
+	}
+	return ret;
+}
diff --git a/fetch-pack.h b/fetch-pack.h
@@ -45,4 +45,10 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 		       struct sha1_array *shallow,
 		       char **pack_lockfile);
 
+/*
+ * Print an appropriate error message for each sought ref that wasn't
+ * matched.  Return 0 if all sought refs were matched, otherwise 1.
+ */
+int report_unmatched_refs(struct ref **sought, int nr_sought);
+
 #endif
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
@@ -484,23 +484,23 @@ test_expect_success 'test lonely missing ref' '
 		cd client &&
 		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy
 	) >/dev/null 2>error-m &&
-	test_cmp expect-error error-m
+	test_i18ncmp expect-error error-m
 '
 
 test_expect_success 'test missing ref after existing' '
 	(
 		cd client &&
 		test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy
 	) >/dev/null 2>error-em &&
-	test_cmp expect-error error-em
+	test_i18ncmp expect-error error-em
 '
 
 test_expect_success 'test missing ref before existing' '
 	(
 		cd client &&
 		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A
 	) >/dev/null 2>error-me &&
-	test_cmp expect-error error-me
+	test_i18ncmp expect-error error-me
 '
 
 test_expect_success 'test --all, --depth, and explicit head' '

Original file line number	Diff line number	Diff line change
`@@ -484,23 +484,23 @@ test_expect_success 'test lonely missing ref' '`
`484`	`484`	`cd client &&`
`485`	`485`	`test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy`
`486`	`486`	`) >/dev/null 2>error-m &&`
`487`		`- test_cmp expect-error error-m`
	`487`	`+ test_i18ncmp expect-error error-m`
`488`	`488`	`'`
`489`	`489`
`490`	`490`	`test_expect_success 'test missing ref after existing' '`
`491`	`491`	`(`
`492`	`492`	`cd client &&`
`493`	`493`	`test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy`
`494`	`494`	`) >/dev/null 2>error-em &&`
`495`		`- test_cmp expect-error error-em`
	`495`	`+ test_i18ncmp expect-error error-em`
`496`	`496`	`'`
`497`	`497`
`498`	`498`	`test_expect_success 'test missing ref before existing' '`
`499`	`499`	`(`
`500`	`500`	`cd client &&`
`501`	`501`	`test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A`
`502`	`502`	`) >/dev/null 2>error-me &&`
`503`		`- test_cmp expect-error error-me`
	`503`	`+ test_i18ncmp expect-error error-me`
`504`	`504`	`'`
`505`	`505`
`506`	`506`	`test_expect_success 'test --all, --depth, and explicit head' '`