Merge branch 'bp/diff-no-index-strbuf-fix'
commitc0f31b83a63f8b3aef0ec28225a50b6bae542d68
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:12 +0000 (23 13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:12 +0000 (23 13:35 -0700)
treea4bbc20e12bc040995137beec4f4f1b53ddc763d
parent4809ff858b78c94ada8bd8a61a89ae8d39eda193
parent176a33542eddc6e319bfef4ca726813ce0b9af55
Merge branch 'bp/diff-no-index-strbuf-fix'

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