Re: [PATCH v5 0/8] extend smudge/clean filters with direct file access (for pu)

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 12, 2016, 19:52 UTC
Message-ID: <xmqqeg6y4os3.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1468277112-9909-1-git-send-email-joeyh@joeyh.name>

Joey Hess <joeyh@joeyh.name> writes:

> Since tb/convert-peek-in-index is not currently in pu, this reroll isn't
> based on it, and will conflict if that topic gets added back into pu.
> Not sure what the status of tb/convert-peek-in-index is at this point?

It appears that we are converging on _not_ using that topic after all (cf. $gmane/299320).

I'll try to apply these on top of a merge between the 'cc/am-apply' topic and the current 'master' branch and requeue.

Show 29 quoted lines

> Improvements from Junio's review:
>
> 	fix build with DEVELOPER=1
> 	style fixes
> 	use test_cmp in test cases
> 	improve robustness of a test case
> 	clean up some confusing code
> 	small performance tweak
>
> Joey Hess (8):
>   clarify %f documentation
>   add smudgeToFile and cleanFromFile filter configs
>   use cleanFromFile in git add
>   use smudgeToFile in git checkout etc
>   warn on unusable smudgeToFile/cleanFromFile config
>   better recovery from failure of smudgeToFile filter
>   use smudgeToFile filter in git am
>   use smudgeToFile filter in recursive merge
>
>  Documentation/config.txt        |  18 ++++-
>  Documentation/gitattributes.txt |  42 ++++++++++++
>  apply.c                         |  16 +++++
>  convert.c                       | 148 ++++++++++++++++++++++++++++++++++++----
>  convert.h                       |  10 +++
>  entry.c                         |  59 ++++++++++++----
>  merge-recursive.c               |  53 +++++++++++---
>  sha1_file.c                     |  42 ++++++++++--
>  t/t0021-conversion.sh           | 117 +++++++++++++++++++++++++++++++
>  9 files changed, 459 insertions(+), 46 deletions(-)