From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 May 2012 20:35:12 +0000 (-0700)
Subject: Merge branch 'bp/diff-no-index-strbuf-fix'
X-Git-Tag: v1.7.11-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0f31b83a63f8b3aef0ec28225a50b6bae542d68;p=thirdparty%2Fgit.git

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
---

c0f31b83a63f8b3aef0ec28225a50b6bae542d68