From: Junio C Hamano <gitster@pobox.com>
To: Joey Hess <joeyh@joeyh.name>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v5 0/8] extend smudge/clean filters with direct file access (for pu)
Date: Tue, 12 Jul 2016 12:52:44 -0700 [thread overview]
Message-ID: <xmqqeg6y4os3.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1468277112-9909-1-git-send-email-joeyh@joeyh.name> (Joey Hess's message of "Mon, 11 Jul 2016 18:45:04 -0400")
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.
> 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(-)
prev parent reply other threads:[~2016-07-12 19:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 22:45 [PATCH v5 0/8] extend smudge/clean filters with direct file access (for pu) Joey Hess
2016-07-11 22:45 ` [PATCH v5 1/8] clarify %f documentation Joey Hess
2016-07-11 22:45 ` [PATCH v5 2/8] add smudgeToFile and cleanFromFile filter configs Joey Hess
2016-07-13 16:02 ` Lars Schneider
2016-07-11 22:45 ` [PATCH v5 3/8] use cleanFromFile in git add Joey Hess
2016-07-11 22:45 ` [PATCH v5 4/8] use smudgeToFile in git checkout etc Joey Hess
2016-07-11 22:45 ` [PATCH v5 5/8] warn on unusable smudgeToFile/cleanFromFile config Joey Hess
2016-07-11 22:45 ` [PATCH v5 6/8] better recovery from failure of smudgeToFile filter Joey Hess
2016-07-11 22:45 ` [PATCH v5 7/8] use smudgeToFile filter in git am Joey Hess
2016-07-11 22:45 ` [PATCH v5 8/8] use smudgeToFile filter in recursive merge Joey Hess
2016-07-12 19:52 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeg6y4os3.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=joeyh@joeyh.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).