Merge branch 'jk/config-ignore-duplicates' into next
commit233df0875a1a4a2c38a8091da1058cf2035d19a6
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:18:21 +0000 (25 07:18 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:18:21 +0000 (25 07:18 -0400)
tree379130b0ef5b5d50efe00546e8e624a8d25d7711
parente1d7ecd2a9f7a3ef2a72eb200144cf98806730a4
parente89558988305c3e912c0674faeb814e44563f7fd
Merge branch 'jk/config-ignore-duplicates' into next

Drop duplicate detection from git-config; this lets it
better match the internal config callbacks, which clears up
some corner cases with includes.

* jk/config-ignore-duplicates:
  git-config: use git_config_with_options
  git-config: do not complain about duplicate entries
  git-config: collect values instead of immediately printing
  git-config: fix regexp memory leaks on error conditions
  git-config: remove memory leak of key regexp
  t1300: test "git config --get-all" more thoroughly
  t1300: remove redundant test
  t1300: style updates
config.c