Merge branch 'ms/maint-config-error-at-eol-linecount' into maint

* ms/maint-config-error-at-eol-linecount:
  config: report errors at the EOL with correct line number

diff --cc config.c
Simple merge

diff --cc t/t1300-repo-config.sh
Simple merge