builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value

ldv-alt · gitster · commit efb98b445363 · 2008-05-28T10:47:12.000-07:00
Sync with builtin-fetch--tool.c where append_fetch_head() honors update_local_ref() return value. This fixes non fast forward fetch exit status, http://bugzilla.altlinux.org/show_bug.cgi?id=15037 Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin-fetch.c b/builtin-fetch.c
@@ -286,7 +286,7 @@ static int store_updated_refs(const char *url, struct ref *ref_map)
 {
 	FILE *fp;
 	struct commit *commit;
-	int url_len, i, note_len, shown_url = 0;
+	int url_len, i, note_len, shown_url = 0, rc = 0;
 	char note[1024];
 	const char *what, *kind;
 	struct ref *rm;
@@ -353,7 +353,7 @@ static int store_updated_refs(const char *url, struct ref *ref_map)
 			note);
 
 		if (ref)
-			update_local_ref(ref, what, verbose, note);
+			rc |= update_local_ref(ref, what, verbose, note);
 		else
 			sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
 				SUMMARY_WIDTH, *kind ? kind : "branch",
@@ -368,7 +368,7 @@ static int store_updated_refs(const char *url, struct ref *ref_map)
 		}
 	}
 	fclose(fp);
-	return 0;
+	return rc;
 }
 
 /*
diff --git a/t/t5518-fetch-exit-status.sh b/t/t5518-fetch-exit-status.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Copyright (c) 2008 Dmitry V. Levin
+#
+
+test_description='fetch exit status test'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+	>file &&
+	git add file &&
+	git commit -m initial &&
+
+	git checkout -b side &&
+	echo side >file &&
+	git commit -a -m side &&
+
+	git checkout master &&
+	echo next >file &&
+	git commit -a -m next
+'
+
+test_expect_success 'non fast forward fetch' '
+
+	test_must_fail git fetch . master:side
+
+'
+
+test_expect_success 'forced update' '
+
+	git fetch . +master:side
+
+'
+
+test_done

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ static int store_updated_refs(const char url, struct ref ref_map)`
`286`	`286`	`{`
`287`	`287`	`FILE *fp;`
`288`	`288`	`struct commit *commit;`
`289`		`- int url_len, i, note_len, shown_url = 0;`
	`289`	`+ int url_len, i, note_len, shown_url = 0, rc = 0;`
`290`	`290`	`char note[1024];`
`291`	`291`	`const char what, kind;`
`292`	`292`	`struct ref *rm;`
`@@ -353,7 +353,7 @@ static int store_updated_refs(const char url, struct ref ref_map)`
`353`	`353`	`note);`
`354`	`354`
`355`	`355`	`if (ref)`
`356`		`- update_local_ref(ref, what, verbose, note);`
	`356`	`+ rc \|= update_local_ref(ref, what, verbose, note);`
`357`	`357`	`else`
`358`	`358`	`sprintf(note, "* %-s %-s -> FETCH_HEAD",`
`359`	`359`	`SUMMARY_WIDTH, *kind ? kind : "branch",`
`@@ -368,7 +368,7 @@ static int store_updated_refs(const char url, struct ref ref_map)`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`	`fclose(fp);`
`371`		`- return 0;`
	`371`	`+ return rc;`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`/*`