commit 6da618d5c2ae95f08c9a24d0cce2d5d93b60cfbe
author Marc Branchaud <marcnarc@xiplink.com> Mon Apr 16 18:08:49 2012 -0400
committer Junio C Hamano <gitster@pobox.com> Tue Apr 17 08:25:44 2012 -0700
tree 4ee3c60c5f539b05b71459c2c0a21fb1ea48c44a
parent 6eab5f2f14806cf6a7b665d96766a59c13a41f4b

fetch: Give remote_ref to update_local_ref() as well

This way, the function can look at the remote side to adjust the
informational message it gives.

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/fetch.c

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 8ec4eae..06d71e4 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -240,6 +240,7 @@
 
 static int update_local_ref(struct ref *ref,
 			    const char *remote,
+			    const struct ref *remote_ref,
 			    struct strbuf *display)
 {
 	struct commit *current = NULL, *updated;
@@ -466,7 +467,7 @@
 
 			strbuf_reset(&note);
 			if (ref) {
-				rc |= update_local_ref(ref, what, &note);
+				rc |= update_local_ref(ref, what, rm, &note);
 				free(ref);
 			} else
 				strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",