diff options
| author |  Marc Branchaud <marcnarc@xiplink.com> | 2012-04-16 18:08:49 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-04-17 08:25:44 -0700 |
| commit | 6da618d5c2ae95f08c9a24d0cce2d5d93b60cfbe (patch) | |
| tree | 4ee3c60c5f539b05b71459c2c0a21fb1ea48c44a /builtin/fetch.c | |
| parent | Merge branch 'maint-1.7.8' into maint-1.7.9 (diff) | |
| download | tgif-6da618d5c2ae95f08c9a24d0cce2d5d93b60cfbe.tar.xz | |
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>
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 3 |
1 files changed, 2 insertions, 1 deletions
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", |