Merge branch 'bp/diff-no-index-strbuf-fix' into maint
commit98eb3fc6cbdede41809e29166ddad4edf6acd1f4
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 18:25:36 +0000 (25 11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 18:25:36 +0000 (25 11:25 -0700)
treea42606abde38efc736e8010ac857e4853aa967c0
parenta3347b988a338e95b7f3b11eda776ac0d7b84dd0
parent176a33542eddc6e319bfef4ca726813ce0b9af55
Merge branch 'bp/diff-no-index-strbuf-fix' into maint

The directory path used in "git diff --no-index", when it recurses
down, was broken with a recent update after v1.7.10.1 release.

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