From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Nov 2017 04:38:33 +0000 (+0900)
Subject: Merge branch 'rs/config-write-section-fix' into maint
X-Git-Tag: v2.15.1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b201e96f94f04d6316cf8c3ce4abed8408fb0857?ds=sidebyside;hp=-c

Merge branch 'rs/config-write-section-fix' into maint

There was a recent semantic mismerge in the codepath to write out a
section of a configuration section, which has been corrected.

* rs/config-write-section-fix:
config: flip return value of write_section()
---

b201e96f94f04d6316cf8c3ce4abed8408fb0857
diff --combined config.c
index adb7d7a3e5,201ad36d34..c38401a750
--- a/config.c
+++ b/config.c
@@@ -16,6 -16,7 +16,6 @@@
  #include "string-list.h"
  #include "utf8.h"
  #include "dir.h"
 -#include "color.h"
  
  struct config_source {
  	struct config_source *prev;
@@@ -1350,6 -1351,9 +1350,6 @@@ int git_default_config(const char *var
  	if (starts_with(var, "advice."))
  		return git_default_advice_config(var, value);
  
 -	if (git_color_config(var, value, dummy) < 0)
 -		return -1;
 -
  	if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {
  		pager_use_color = git_config_bool(var,value);
  		return 0;
@@@ -2315,7 -2319,7 +2315,7 @@@ static ssize_t write_section(int fd, co
  	struct strbuf sb = store_create_section(key);
  	ssize_t ret;
  
- 	ret = write_in_full(fd, sb.buf, sb.len) == sb.len;
+ 	ret = write_in_full(fd, sb.buf, sb.len);
  	strbuf_release(&sb);
  
  	return ret;