Merge branch 'jk/unleak-fixes'

Fix some incorrect UNLEAK() annotations.

* jk/unleak-fixes:
  ls-remote: simplify UNLEAK() usage
  stop calling UNLEAK() before die()

diff --cc builtin/ls-remote.c
Simple merge

diff --cc midx.c
Simple merge