From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Feb 2016 22:54:13 +0000 (-0800)
Subject: Merge branch 'jk/filter-branch-no-index' into maint
X-Git-Tag: v2.7.1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16f5e2683304b986be49a919198d04652a126271;p=thirdparty%2Fgit.git

Merge branch 'jk/filter-branch-no-index' into maint

A recent optimization to filter-branch in v2.7.0 introduced a
regression when --prune-empty filter is used, which has been
corrected.

* jk/filter-branch-no-index:
  filter-branch: resolve $commit^{tree} in no-index case
---

16f5e2683304b986be49a919198d04652a126271