From: Joey Hess Date: Wed, 22 Jun 2016 20:21:25 GMT Subject: [PATCH v3 0/8] extend smudge/clean filters with direct file access Message-ID: <20160622202133.23565-1-joeyh@joeyh.name> Reroll of this patch set with changes: * Added additional smudgeToFile calls in git am and recursive merge. * Improved behavior when smudgeToFile filter fails. * Some small improvements to the test cases. I hope this will be the final version. 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 ++++++++++++ builtin/apply.c | 16 +++++ convert.c | 141 ++++++++++++++++++++++++++++++++++++---- convert.h | 10 +++ entry.c | 53 +++++++++++---- merge-recursive.c | 42 +++++++++--- sha1_file.c | 42 ++++++++++-- t/t0021-conversion.sh | 115 ++++++++++++++++++++++++++++++++ 9 files changed, 434 insertions(+), 45 deletions(-) -- 2.9.0.8.g973eabb.dirty