From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Jan 2016 00:10:12 +0000 (-0800)
Subject: Merge branch 'jk/filter-branch-no-index'
X-Git-Tag: v2.8.0-rc0~95
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=a2ec9484c1517305e2e28d64d8d77642f05e9a02;p=git.git

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

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

a2ec9484c1517305e2e28d64d8d77642f05e9a02