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

Merge branch 'fc/decorate-tag'

Browse Source 
* fc/decorate-tag:
  Prettify log decorations even more
  Change prettify_ref to prettify_refname
This commit is contained in:
Junio C Hamano 2009-05-23 01:43:50 -07:00
commit 44ee247f8d
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-fetch.c
View File

@ -197,7 +197,7 @@ static int update_local_ref(struct ref *ref,
struct commit *current = NULL, *updated; struct commit *current = NULL, *updated;
enum object_type type; enum object_type type;
struct branch *current_branch = branch_get(NULL); struct branch *current_branch = branch_get(NULL);
const char *pretty_ref = prettify_ref(ref); const char *pretty_ref = prettify_refname(ref->name);
*display = 0; *display = 0;
type = sha1_object_info(ref->new_sha1, NULL); type = sha1_object_info(ref->new_sha1, NULL);

4
builtin-send-pack.c
View File

@ -178,9 +178,9 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str
{ {
fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary); fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
if (from) 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 else
fputs(prettify_ref(to), stderr); fputs(prettify_refname(to->name), stderr);
if (msg) { if (msg) {
fputs(" (", stderr); fputs(" (", stderr);
fputs(msg, stderr); fputs(msg, stderr);

1
log-tree.c
View File

@ -25,6 +25,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
struct object *obj = parse_object(sha1); struct object *obj = parse_object(sha1);
if (!obj) if (!obj)
return 0; return 0;
refname = prettify_refname(refname);
add_name_decoration("", refname, obj); add_name_decoration("", refname, obj);
while (obj->type == OBJ_TAG) { while (obj->type == OBJ_TAG) {
obj = ((struct tag *)obj)->tagged; obj = ((struct tag *)obj)->tagged;

3
refs.c
View File

@ -751,9 +751,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 + ( return name + (
!prefixcmp(name, "refs/heads/") ? 11 : !prefixcmp(name, "refs/heads/") ? 11 :
!prefixcmp(name, "refs/tags/") ? 10 : !prefixcmp(name, "refs/tags/") ? 10 :

2
refs.h
View File

@ -80,7 +80,7 @@ extern int for_each_reflog(each_ref_fn, void *);
#define CHECK_REF_FORMAT_WILDCARD (-3) #define CHECK_REF_FORMAT_WILDCARD (-3)
extern int check_ref_format(const char *target); 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); extern char *shorten_unambiguous_ref(const char *ref, int strict);
/** rename ref, return 0 on success **/ /** rename ref, return 0 on success **/

6
t/t4013/diff.log_--decorate_--all
View File

@ -1,12 +1,12 @@
$ git log --decorate --all $ git log --decorate --all
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (refs/heads/master) commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (master)
Merge: 9a6d494 c7a2ab9 Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000 Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side' Merge branch 'side'
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side) commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:03:00 2006 +0000 Date: Mon Jun 26 00:03:00 2006 +0000
@ -26,7 +26,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
This is the second commit. This is the second commit.
commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial) commit 444ac553ac7612cc88969031b02b3767fb8a353a (initial)
Author: A U Thor <author@example.com> Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:00:00 2006 +0000 Date: Mon Jun 26 00:00:00 2006 +0000

4
transport.c
View File

@ -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); fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
if (from) 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 else
fputs(prettify_ref(to), stderr); fputs(prettify_refname(to->name), stderr);
if (msg) { if (msg) {
fputs(" (", stderr); fputs(" (", stderr);
fputs(msg, stderr); fputs(msg, stderr);