Merge branch 'sb/misc-cleanups'
commit934908ae5bcd7b9944d925f73e05c60b2687c8b7
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (10 13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (10 13:40 -0700)
tree84f7eb93559ef20fbdfad8eef00e1274fcce4bb9
parent54c2af5aa3471e3e6de934d411d1bce74eb25960
parent99dab16863c2eca584a84bdde748b9c113717603
Merge branch 'sb/misc-cleanups'

* sb/misc-cleanups:
  submodule-config: don't shadow `cache`
  config.c: drop local variable
config.c
submodule-config.c