Merge branch 'jk/config-no-ungetc-eof'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2015 19:45:01 +0000 (11:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2015 19:45:01 +0000 (11:45 -0800)
Reading configuration from a blob object, when it ends with a lone
CR, use to confuse the configuration parser.

* jk/config-no-ungetc-eof:
config_buf_ungetc: warn when pushing back a random character
config: do not ungetc EOF

1  2 
config.c
diff --cc config.c
Simple merge