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)
commitde15bdb0583a1a65bf1bab47b7bec9bdc03f727a
tree36d6f1b6626f57b3a0fcfd93958e29b2aa4fcf4d
parent2c1f554d0ca2c35c213d68d94baf30f11180f4ce
parent1d0655c15ebf7dfb460466d058daab790ed285b2
Merge branch 'jk/config-no-ungetc-eof'

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