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>
This commit is contained in:
parent
6eab5f2f14
commit
6da618d5c2
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user