From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Jan 2013 07:41:57 +0000 (-0800)
Subject: Merge branch 'jc/format-color-auto'
X-Git-Tag: v1.8.2-rc0~180
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/946a5aee3e896aa12cb9d4d21079c6e299baad81

Merge branch 'jc/format-color-auto'

Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
not color its output when writing to a non-terminal.

* jc/format-color-auto:
  log --format: teach %C(auto,black) to respect color config
  t6006: clean up whitespace
---

946a5aee3e896aa12cb9d4d21079c6e299baad81
diff --cc commit.h
index b6ad8f3f30,73fd399b09..0f469e507d
--- a/commit.h
+++ b/commit.h
@@@ -86,9 -86,10 +86,10 @@@ struct pretty_print_context 
  	enum date_mode date_mode;
  	unsigned date_mode_explicit:1;
  	int need_8bit_cte;
 -	int show_notes;
 +	char *notes_message;
  	struct reflog_walk_info *reflog_info;
  	const char *output_encoding;
+ 	int color;
  };
  
  struct userformat_want {