From: Junio C Hamano <gitster@pobox•com>
To: Joey Hess <joeyh@joeyh•name>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v2 0/4] extend smudge/clean filters with direct file access
Date: Fri, 17 Jun 2016 14:17:16 -0700 [thread overview]
Message-ID: <xmqqshwbzfab.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1466195481-23209-1-git-send-email-joeyh@joeyh.name> (Joey Hess's message of "Fri, 17 Jun 2016 16:31:17 -0400")
Joey Hess <joeyh@joeyh•name> writes:
> Reroll of this patch set with changes:
... where is this 4-patch series designed to apply? The first one
already fails...
Applying: add smudgeToFile and cleanFromFile filter configs
.git/rebase-apply/patch:28: trailing whitespace.
Similar to filter.<driver>.clean but the specified command
.git/rebase-apply/patch:30: trailing whitespace.
receiving the file content from standard input.
.git/rebase-apply/patch:129: indent with spaces.
struct strbuf *dst, const char *cmd)
fatal: sha1 information is lacking or useless (Documentation/gitattributes.txt).
error: could not build fake ancestor
Patch failed at 0001 add smudgeToFile and cleanFromFile filter configs
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
>
> * Renamed the new filter drivers for consistency with other configs.
> * Improved documentation with feedback from Junio and others.
> * Eliminated %p and instead append the filename to the commands
> (separated by a space).
> * Fixed an FD leak and a space leak.
> * Only use smudgeToFile with regular files, not symlinks.
> * After running the smudgeToFile command, double-check that the
> expected file is present, in case the command was buggy and deleted it.
> * Added a warning message when the new filter commands are configured
> but the old ones are not, so that the user knows it's refusing to use
> their configuration.
>
> There's been good and helpful documentation and interface review,
> but some more code review would be good! Also, git-annex has a
> improved-smudge-filters branch now that demonstrates this interface.
>
> Joey Hess (4):
> add smudgeToFile and cleanFromFile filter configs
> use cleanFromFile in git add
> use smudgeToFile in git checkout etc
> warn on unusable smudgeToFile/cleanFromFile config
>
> Documentation/config.txt | 18 +++++-
> Documentation/gitattributes.txt | 37 ++++++++++++
> convert.c | 126 +++++++++++++++++++++++++++++++++++-----
> convert.h | 10 ++++
> entry.c | 37 +++++++++---
> sha1_file.c | 42 ++++++++++++--
> t/t0021-conversion.sh | 64 ++++++++++++++++++++
> 7 files changed, 304 insertions(+), 30 deletions(-)
next prev parent reply other threads:[~2016-06-17 21:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 20:31 [PATCH v2 0/4] extend smudge/clean filters with direct file access Joey Hess
2016-06-17 20:31 ` [PATCH v2 1/4] add smudgeToFile and cleanFromFile filter configs Joey Hess
2016-06-17 20:31 ` [PATCH v2 2/4] use cleanFromFile in git add Joey Hess
2016-06-17 20:31 ` [PATCH v2 3/4] use smudgeToFile in git checkout etc Joey Hess
2016-06-17 20:31 ` [PATCH v2 4/4] warn on unusable smudgeToFile/cleanFromFile config Joey Hess
2016-06-17 21:05 ` [PATCH v2 0/4] extend smudge/clean filters with direct file access Joey Hess
2016-06-17 21:17 ` Junio C Hamano [this message]
2016-06-17 22:43 ` [PATCH v2 0/4] clarify %f documentation Joey Hess
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqshwbzfab.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=joeyh@joeyh$(echo .)name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox