Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:41 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:41 +0000 (13:51 -0700)
Compilation fix.

* jk/squelch-false-warning-from-gcc-o3:
color_parse_mem: initialize "struct color" temporary
error_errno: use constant return similar to error()

1  2 
color.c
git-compat-util.h
diff --cc color.c
Simple merge
Simple merge