diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-25 14:46:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-25 14:46:12 -0700 |
| commit | d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4 (patch) | |
| tree | 5c5c94d5853acf90d9e379de637c7b21ba5dc92f /log-tree.c | |
| parent | b91069ae9a6cb2d92fa6a5ed6d258bed530abcc7 (diff) | |
| parent | 33e7018c459e6583b899690cabd21c808ffd3c85 (diff) | |
| download | git-d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4.tar.gz git-d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4.tar.xz | |
Merge branch 'lh/short-decorate'
* lh/short-decorate:
git-log: allow --decorate[=short|full]
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/log-tree.c b/log-tree.c index a3b4c0692..1c9eefee3 100644 --- a/log-tree.c +++ b/log-tree.c @@ -25,7 +25,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in struct object *obj = parse_object(sha1); if (!obj) return 0; - refname = prettify_refname(refname); + if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS) + refname = prettify_refname(refname); add_name_decoration("", refname, obj); while (obj->type == OBJ_TAG) { obj = ((struct tag *)obj)->tagged; @@ -36,12 +37,12 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in return 0; } -void load_ref_decorations(void) +void load_ref_decorations(int flags) { static int loaded; if (!loaded) { loaded = 1; - for_each_ref(add_ref_decoration, NULL); + for_each_ref(add_ref_decoration, &flags); } } |