From 6da618d5c2ae95f08c9a24d0cce2d5d93b60cfbe Mon Sep 17 00:00:00 2001 From: Marc Branchaud Date: Mon, 16 Apr 2012 18:08:49 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin/fetch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 8ec4eae3eb..06d71e4e4c 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -240,6 +240,7 @@ static int s_update_ref(const char *action, 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 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, strbuf_reset(¬e); if (ref) { - rc |= update_local_ref(ref, what, ¬e); + rc |= update_local_ref(ref, what, rm, ¬e); free(ref); } else strbuf_addf(¬e, "* %-*s %-*s -> FETCH_HEAD", -- 2.11.4.GIT