Merge branch 'bp/diff-no-index-strbuf-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:12 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:12 +0000 (13:35 -0700)
Fix regressions to "git diff --no-index" when it recurses down.

By Bobby Powers
* bp/diff-no-index-strbuf-fix:
diff --no-index: don't leak buffers in queue_diff
diff --no-index: reset temporary buffer lengths on directory iteration

Trivial merge