diff options
Diffstat (limited to 'sideband.c')
| -rw-r--r-- | sideband.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sideband.c b/sideband.c index 266a67342b..4e816be4e9 100644 --- a/sideband.c +++ b/sideband.c @@ -1,3 +1,5 @@ +#define USE_THE_REPOSITORY_VARIABLE + #include "git-compat-util.h" #include "color.h" #include "config.h" @@ -30,28 +32,27 @@ static int use_sideband_colors(void) const char *key = "color.remote"; struct strbuf sb = STRBUF_INIT; - char *value; + const char *value; int i; if (use_sideband_colors_cached >= 0) return use_sideband_colors_cached; - if (!git_config_get_string(key, &value)) { + if (!git_config_get_string_tmp(key, &value)) use_sideband_colors_cached = git_config_colorbool(key, value); - } else if (!git_config_get_string("color.ui", &value)) { + else if (!git_config_get_string_tmp("color.ui", &value)) use_sideband_colors_cached = git_config_colorbool("color.ui", value); - } else { + else use_sideband_colors_cached = GIT_COLOR_AUTO; - } for (i = 0; i < ARRAY_SIZE(keywords); i++) { strbuf_reset(&sb); strbuf_addf(&sb, "%s.%s", key, keywords[i].keyword); - if (git_config_get_string(sb.buf, &value)) - continue; - if (color_parse(value, keywords[i].color)) + if (git_config_get_string_tmp(sb.buf, &value)) continue; + color_parse(value, keywords[i].color); } + strbuf_release(&sb); return use_sideband_colors_cached; } @@ -220,7 +221,7 @@ int demultiplex_sideband(const char *me, int status, } strbuf_addch(scratch, *brk); - xwrite(2, scratch->buf, scratch->len); + write_in_full(2, scratch->buf, scratch->len); strbuf_reset(scratch); b = brk + 1; @@ -247,7 +248,7 @@ cleanup: die("%s", scratch->buf); if (scratch->len) { strbuf_addch(scratch, '\n'); - xwrite(2, scratch->buf, scratch->len); + write_in_full(2, scratch->buf, scratch->len); } strbuf_release(scratch); return 1; |