From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Apr 2013 23:15:44 +0000 (-0700)
Subject: Merge branch 'sr/log-SG-no-textconv' into maint
X-Git-Tag: v1.8.2.2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=283c63fac2c76deda2058f03000e18fb35d44fb6;p=git

Merge branch 'sr/log-SG-no-textconv' into maint

"git log -S/-G" started paying attention to textconv filter, but
there was no way to disable this.  Make it honor --no-textconv
option.

* sr/log-SG-no-textconv:
  diffcore-pickaxe: unify code for log -S/-G
  diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"
  diffcore-pickaxe: port optimization from has_changes() to diff_grep()
  diffcore-pickaxe: respect --no-textconv
  diffcore-pickaxe: remove fill_one()
  diffcore-pickaxe: remove unnecessary call to get_textconv()
---

283c63fac2c76deda2058f03000e18fb35d44fb6