diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:28:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:28:46 -0700 |
| commit | f23336f5c15eb90df3275076181d10746479be5b (patch) | |
| tree | e1be7917fda3ee83120b58faf2a862a42275193d /builtin-fetch.c | |
| parent | 3fcee259d023087184c63eedf1015be6e23ea6e1 (diff) | |
| parent | 64fcef2daa03f6093b480142c6ab2a4173b0b43e (diff) | |
| download | git-f23336f5c15eb90df3275076181d10746479be5b.tar.gz | |
Merge branch 'db/push-cleanup'
* db/push-cleanup:
Move push matching and reporting logic into transport.c
Use a common function to get the pretty name of refs
Conflicts:
transport.c
Diffstat (limited to 'builtin-fetch.c')
| -rw-r--r-- | builtin-fetch.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 7293146525..3c998ea740 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -197,11 +197,7 @@ static int update_local_ref(struct ref *ref, struct commit *current = NULL, *updated; enum object_type type; struct branch *current_branch = branch_get(NULL); - const char *pretty_ref = ref->name + ( - !prefixcmp(ref->name, "refs/heads/") ? 11 : - !prefixcmp(ref->name, "refs/tags/") ? 10 : - !prefixcmp(ref->name, "refs/remotes/") ? 13 : - 0); + const char *pretty_ref = prettify_ref(ref); *display = 0; type = sha1_object_info(ref->new_sha1, NULL); |