diff options
| author | Jeff King <peff@peff.net> | 2010-12-09 17:27:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-10 20:59:52 (GMT) |
| commit | 148135fc24dce1e61cfd7fcedea4210095099e78 (patch) | |
| tree | b3fa5923cb325d677aeb12db1406d606c6b24b8a /color.h | |
| parent | 1d282327d7354dd3a1caefa4af06562aa816710d (diff) | |
| download | git-148135fc24dce1e61cfd7fcedea4210095099e78.zip git-148135fc24dce1e61cfd7fcedea4210095099e78.tar.gz git-148135fc24dce1e61cfd7fcedea4210095099e78.tar.bz2 | |
default color.status.branch to "same as header"
This gives it the same behavior as we had prior to 1d28232
(status: show branchname with a configurable color).
To do this we need the concept of a "NIL" color, which is
provided by color.[ch]. The implementation is very simple;
in particular, there are no precautions taken against code
accidentally printing the NIL. This should be fine in
practice because:
1. You can't input a NIL color in the config, so it must
come from the in-code defaults. Which means it is up
the client code to handle the NILs it defines.
2. If we do ever print a NIL, it will be obvious what the
problem is, and the bug can be fixed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'color.h')
| -rw-r--r-- | color.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -43,6 +43,9 @@ #define GIT_COLOR_BG_MAGENTA "\033[45m" #define GIT_COLOR_BG_CYAN "\033[46m" +/* A special value meaning "no color selected" */ +#define GIT_COLOR_NIL "NIL" + /* * This variable stores the value of color.ui */ @@ -62,4 +65,6 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...); __attribute__((format (printf, 3, 4))) int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...); +int color_is_nil(const char *color); + #endif /* COLOR_H */ |