diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-05-14 00:22:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-13 20:55:48 -0700 |
| commit | 4577e483648f50dd80faa401dc1d3eb33ffb627b (patch) | |
| tree | fcde4fade4012f4ab0004d6590c05f63e4e66d5c | |
| parent | f01f1099f40f24fe6f7802185340a6fa3a3d4f35 (diff) | |
| download | git-4577e483648f50dd80faa401dc1d3eb33ffb627b.tar.gz | |
Change prettify_ref to prettify_refname
In preparation to be used when the ref object is not available
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-fetch.c | 2 | ||||
| -rw-r--r-- | builtin-send-pack.c | 4 | ||||
| -rw-r--r-- | refs.c | 3 | ||||
| -rw-r--r-- | refs.h | 2 | ||||
| -rw-r--r-- | transport.c | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 3c998ea740..ebd0c08788 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -197,7 +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 = prettify_ref(ref); + const char *pretty_ref = prettify_refname(ref->name); *display = 0; type = sha1_object_info(ref->new_sha1, NULL); diff --git a/builtin-send-pack.c b/builtin-send-pack.c index d5a1c48d0e..b2279b0d29 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -174,9 +174,9 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str { fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary); if (from) - fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to)); + fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); else - fputs(prettify_ref(to), stderr); + fputs(prettify_refname(to->name), stderr); if (msg) { fputs(" (", stderr); fputs(msg, stderr); @@ -750,9 +750,8 @@ int check_ref_format(const char *ref) } } -const char *prettify_ref(const struct ref *ref) +const char *prettify_refname(const char *name) { - const char *name = ref->name; return name + ( !prefixcmp(name, "refs/heads/") ? 11 : !prefixcmp(name, "refs/tags/") ? 10 : @@ -80,7 +80,7 @@ extern int for_each_reflog(each_ref_fn, void *); #define CHECK_REF_FORMAT_WILDCARD (-3) extern int check_ref_format(const char *target); -extern const char *prettify_ref(const struct ref *ref); +extern const char *prettify_refname(const char *refname); extern char *shorten_unambiguous_ref(const char *ref, int strict); /** rename ref, return 0 on success **/ diff --git a/transport.c b/transport.c index 3dfb03c06e..38c7f578e5 100644 --- a/transport.c +++ b/transport.c @@ -732,9 +732,9 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str { fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary); if (from) - fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to)); + fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); else - fputs(prettify_ref(to), stderr); + fputs(prettify_refname(to->name), stderr); if (msg) { fputs(" (", stderr); fputs(msg, stderr); |