Merge branch 'sb/misc-cleanups' into HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:15 +0000 (14:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:15 +0000 (14:40 -0700)
* sb/misc-cleanups:
submodule-config: don't shadow `cache`
config.c: drop local variable
credential-cache, send_request: close fd when done
bundle: don't leak an fd in case of early return
abbrev_sha1_in_line: don't leak memory
notes: don't leak memory in git_config_get_notes_strategy

1  2 
builtin/notes.c
config.c
submodule-config.c
wt-status.c
diff --cc builtin/notes.c
Simple merge
diff --cc config.c
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge