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

[Joey Hess <joeyh@joeyh.name>]

Back from vacation with a reroll of jh/clean-smudge-annex.

Deals with conflicting changes from cc/apply-am in pu.

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?

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

-- 
2.8.1