]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bp/diff-no-index-strbuf-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 18:25:36 +0000 (11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 18:25:36 +0000 (11:25 -0700)
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


Trivial merge