Merge branch 'jk/config-no-ungetc-eof' into next
commitb7fc890b044a7d173510d634fa8eb68bb3009d71
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Feb 2015 23:10:04 +0000 (16 15:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Feb 2015 23:10:05 +0000 (16 15:10 -0800)
treed4bce2d94f941a74cee5101afd0d447d7c60669d
parent2e304244eff3dccd926b6566918bb3141d5c1ce7
parent1d0655c15ebf7dfb460466d058daab790ed285b2
Merge branch 'jk/config-no-ungetc-eof' into next

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
config.c