diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-11-20 11:40:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-20 11:40:29 -0800 |
| commit | 62ce40d9338046a89de5d2bfb6b258872fd366c0 (patch) | |
| tree | caec918aacac7203a8d8c25145b412b9fed6a8cc /color.h | |
| parent | t4026: test "normal" color (diff) | |
| parent | color_parse: do not mention variable name in error message (diff) | |
| download | tgif-62ce40d9338046a89de5d2bfb6b258872fd366c0.tar.xz | |
Merge branch 'jn/parse-config-slot' into jk/colors
* jn/parse-config-slot:
color_parse: do not mention variable name in error message
pass config slots as pointers instead of offsets
Diffstat (limited to 'color.h')
| -rw-r--r-- | color.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -77,8 +77,8 @@ int git_color_default_config(const char *var, const char *value, void *cb); int git_config_colorbool(const char *var, const char *value); int want_color(int var); -void color_parse(const char *value, const char *var, char *dst); -void color_parse_mem(const char *value, int len, const char *var, char *dst); +int color_parse(const char *value, char *dst); +int color_parse_mem(const char *value, int len, char *dst); __attribute__((format (printf, 3, 4))) int color_fprintf(FILE *fp, const char *color, const char *fmt, ...); __attribute__((format (printf, 3, 4))) |