Skip to content

Commit 6da618d

Browse files
marcnarcgitster
authored andcommitted
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>
1 parent 6eab5f2 commit 6da618d

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

builtin/fetch.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ static int s_update_ref(const char *action,
240240

241241
static int update_local_ref(struct ref *ref,
242242
const char *remote,
243+
const struct ref *remote_ref,
243244
struct strbuf *display)
244245
{
245246
struct commit *current = NULL, *updated;
@@ -466,7 +467,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
466467

467468
strbuf_reset(&note);
468469
if (ref) {
469-
rc |= update_local_ref(ref, what, &note);
470+
rc |= update_local_ref(ref, what, rm, &note);
470471
free(ref);
471472
} else
472473
strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",

0 commit comments

Comments
 (0)