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>
Marc Branchaud committed
Apr 16, 2012 at 18:08 UTC
6da618d5c2ae95f08c9a24d0cce2d5d93b60cfbe
1 file changed
+2
-1
builtin/fetch.c
+2
-1
@@ -240,6 +240,7 @@ static int s_update_ref(const char *action,
240
241
static int update_local_ref(struct ref *ref,
242
const char *remote,
243
+ const struct ref *remote_ref,
244
struct strbuf *display)
245
{
246
struct commit *current = NULL, *updated;
@@ -466,7 +467,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
467
468
strbuf_reset(¬e);
469
if (ref) {
469
- rc |= update_local_ref(ref, what, ¬e);
470
+ rc |= update_local_ref(ref, what, rm, ¬e);
471
free(ref);
472
} else
473
strbuf_addf(¬e, "* %-*s %-*s -> FETCH_HEAD",