Merge branch 'sg/skip-prefix-in-prettify-refname'

Code cleanup.

* sg/skip-prefix-in-prettify-refname:
  refs.c: use skip_prefix() in prettify_refname()
maint
Junio C Hamano 2017-03-28 14:05:59 -07:00
commit f494890292
1 changed files with 5 additions and 5 deletions

10
refs.c
View File

@ -366,11 +366,11 @@ int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data)


const char *prettify_refname(const char *name) const char *prettify_refname(const char *name)
{ {
return name + ( if (skip_prefix(name, "refs/heads/", &name) ||
starts_with(name, "refs/heads/") ? 11 : skip_prefix(name, "refs/tags/", &name) ||
starts_with(name, "refs/tags/") ? 10 : skip_prefix(name, "refs/remotes/", &name))
starts_with(name, "refs/remotes/") ? 13 : ; /* nothing */
0); return name;
} }


static const char *ref_rev_parse_rules[] = { static const char *ref_rev_parse_rules[] = {