public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Joey Hess <joeyh@joeyh•name>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v4 0/8] extend smudge/clean filters with direct file access (for pu)
Date: Wed, 22 Jun 2016 14:23:28 -0700	[thread overview]
Message-ID: <xmqqeg7olxyn.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1466629758-8035-1-git-send-email-joeyh@joeyh.name> (Joey Hess's message of "Wed, 22 Jun 2016 17:09:10 -0400")

Joey Hess <joeyh@joeyh•name> writes:

> This is the same as v3, except rebased on top of tb/convert-peek-in-index
> to fix a build failure in pu.

This is somewhat unfortunate, as tb/convert-peek-in-index probably
needs further rerolls after getting reviewed by somebody (other than
me) and this topic will have to be rebased every time.

Let's see how it goes.

Thanks.

>
> 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                       | 147 +++++++++++++++++++++++++++++++++++-----
>  convert.h                       |  11 +++
>  entry.c                         |  53 +++++++++++----
>  merge-recursive.c               |  42 +++++++++---
>  sha1_file.c                     |  44 ++++++++++--
>  t/t0021-conversion.sh           | 115 +++++++++++++++++++++++++++++++
>  9 files changed, 441 insertions(+), 47 deletions(-)

     prev parent reply	other threads:[~2016-06-22 21:24 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-22 21:09 [PATCH v4 0/8] extend smudge/clean filters with direct file access (for pu) Joey Hess
2016-06-22 21:09 ` [PATCH v4 1/8] clarify %f documentation Joey Hess
2016-06-22 21:09 ` [PATCH v4 2/8] add smudgeToFile and cleanFromFile filter configs Joey Hess
2016-06-22 21:09 ` [PATCH v4 3/8] use cleanFromFile in git add Joey Hess
2016-06-22 21:09 ` [PATCH v4 4/8] use smudgeToFile in git checkout etc Joey Hess
2016-06-22 21:09 ` [PATCH v4 5/8] warn on unusable smudgeToFile/cleanFromFile config Joey Hess
2016-06-22 21:09 ` [PATCH v4 6/8] better recovery from failure of smudgeToFile filter Joey Hess
2016-06-22 21:09 ` [PATCH v4 7/8] use smudgeToFile filter in git am Joey Hess
2016-06-22 21:09 ` [PATCH v4 8/8] use smudgeToFile filter in recursive merge Joey Hess
2016-06-22 21:39   ` Junio C Hamano
2016-06-22 22:45     ` Junio C Hamano
2016-06-22 21:23 ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqeg7olxyn.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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox