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>
Felipe Contreras committed
May 14, 2009 at 00:22 UTC
4577e483648f50dd80faa401dc1d3eb33ffb627b
5 files changed
+7
-8
builtin-fetch.c
+1
-1
@@ -197,7 +197,7 @@ static int update_local_ref(struct ref *ref,
197
struct commit *current = NULL, *updated;
198
enum object_type type;
199
struct branch *current_branch = branch_get(NULL);
200
- const char *pretty_ref = prettify_ref(ref);
200
+ const char *pretty_ref = prettify_refname(ref->name);
201
202
*display = 0;
203
type = sha1_object_info(ref->new_sha1, NULL);
builtin-send-pack.c
+2
-2
@@ -174,9 +174,9 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str
174
{
175
fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
176
if (from)
177
- fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
177
+ fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
178
else
179
- fputs(prettify_ref(to), stderr);
179
+ fputs(prettify_refname(to->name), stderr);
180
if (msg) {
181
fputs(" (", stderr);
182
fputs(msg, stderr);
refs.c
+1
-2
@@ -750,9 +750,8 @@ int check_ref_format(const char *ref)
750
}
751
}
752
753
-const char *prettify_ref(const struct ref *ref)
753
+const char *prettify_refname(const char *name)
754
{
755
- const char *name = ref->name;
755
return name + (
756
!prefixcmp(name, "refs/heads/") ? 11 :
757
!prefixcmp(name, "refs/tags/") ? 10 :
refs.h
+1
-1
@@ -80,7 +80,7 @@ extern int for_each_reflog(each_ref_fn, void *);
80
#define CHECK_REF_FORMAT_WILDCARD (-3)
81
extern int check_ref_format(const char *target);
82
83
-extern const char *prettify_ref(const struct ref *ref);
83
+extern const char *prettify_refname(const char *refname);
84
extern char *shorten_unambiguous_ref(const char *ref, int strict);
85
86
/** rename ref, return 0 on success **/
transport.c
+2
-2
@@ -732,9 +732,9 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str
732
{
733
fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
734
if (from)
735
- fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
735
+ fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
736
else
737
- fputs(prettify_ref(to), stderr);
737
+ fputs(prettify_refname(to->name), stderr);
738
if (msg) {
739
fputs(" (", stderr);
740
fputs(msg, stderr);