diff --git a/builtin-log.c b/builtin-log.c
index 8d16832f7e9483f7903009459a72efc39e267c98..3100dc00a8b4d0c48f9febc1178befa37226b5d0 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
static const char *default_date_mode = NULL;
static int default_show_root = 1;
+static int decoration_style = 0;
static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_pretty;
struct rev_info *rev)
{
int i;
- int decoration_style = 0;
rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
return git_config_string(&fmt_patch_subject_prefix, var, value);
if (!strcmp(var, "log.date"))
return git_config_string(&default_date_mode, var, value);
+ if (!strcmp(var, "log.decorate")) {
+ if (!strcmp(value, "full"))
+ decoration_style = DECORATE_FULL_REFS;
+ else if (!strcmp(value, "short"))
+ decoration_style = DECORATE_SHORT_REFS;
+ return 0;
+ }
if (!strcmp(var, "log.showroot")) {
default_show_root = git_config_bool(var, value);
return 0;