Merge branch 'maint'

* maint:
  diff.c: plug a memory leak in an error path
  fetch-pack: close output channel after sideband demultiplexer terminates
  builtin-remote: Make "remote show" display all urls

diff --cc builtin-remote.c
Simple merge

diff --cc diff.c
Simple merge