undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: Give remote_ref to update_local_ref() as well

Browse Source 
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:
Marc Branchaud 2012-04-16 18:08:49 -04:00 committed by Junio C Hamano
parent 6eab5f2f14
commit 6da618d5c2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/fetch.c
View File

@ -240,6 +240,7 @@ static int s_update_ref(const char *action,
static int update_local_ref(struct ref *ref, static int update_local_ref(struct ref *ref,
const char *remote, const char *remote,
const struct ref *remote_ref,
struct strbuf *display) struct strbuf *display)
{ {
struct commit *current = NULL, *updated; struct commit *current = NULL, *updated;
@ -466,7 +467,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
strbuf_reset(&note); strbuf_reset(&note);
if (ref) { if (ref) {
rc |= update_local_ref(ref, what, &note); rc |= update_local_ref(ref, what, rm, &note);
free(ref); free(ref);
} else } else
strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD", strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",