From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Jun 2017 01:20:57 +0000 (+0900)
Subject: Merge branch 'ah/log-decorate-default-to-auto' into maint
X-Git-Tag: v2.13.1~38
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231?hp=-c

Merge branch 'ah/log-decorate-default-to-auto' into maint

Setting "log.decorate=false" in the configuration file did not take
effect in v2.13, which has been corrected.

* ah/log-decorate-default-to-auto:
builtin/log: honor log.decorate
---

fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231
diff --combined builtin/log.c
index b3b10cc1ed,cf2b736ca7..ec3258368c
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -110,6 -110,8 +110,8 @@@ static void init_log_defaults(void
  {
  	init_grep_defaults();
  	init_diff_ui_defaults();
+ 
+ 	decoration_style = auto_decoration_style();
  }
  
  static void cmd_log_init_defaults(struct rev_info *rev)
@@@ -410,8 -412,6 +412,6 @@@ static int git_log_config(const char *v
  		if (decoration_style < 0)
  			decoration_style = 0; /* maybe warn? */
  		return 0;
- 	} else {
- 		decoration_style = auto_decoration_style();
  	}
  	if (!strcmp(var, "log.showroot")) {
  		default_show_root = git_config_bool(var, value);
@@@ -1091,7 -1091,8 +1091,7 @@@ static const char *set_outdir(const cha
  	if (!output_directory)
  		return prefix;
  
 -	return xstrdup(prefix_filename(prefix, outdir_offset,
 -				       output_directory));
 +	return prefix_filename(prefix, output_directory);
  }
  
  static const char * const builtin_format_patch_usage[] = {