Joey Hess <jo...@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(-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
