From: Junio C Hamano <gitster@pobox.com>
To: larsxschneider@gmail.com
Cc: git@vger.kernel.org, tboegi@web.de, sunshine@sunshineco.com,
peff@peff.net
Subject: Re: [PATCH v2] convert: legitimately disable clean/smudge filter with an empty override
Date: Fri, 29 Jan 2016 10:48:55 -0800 [thread overview]
Message-ID: <xmqqwpqsi5m0.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqh9hwjlha.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Fri, 29 Jan 2016 10:20:49 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Instead, teach apply_filter() to treat an empty string given as a
> filter means the input must be returned as-is without conversion,
> and the operation must always succeed.
Ugh, that was a non-sentence.
Instead, teach apply_filter() to treat an empty string as a no-op
filter that always returns successfully its input as-is without
conversion.
was what I meant to say.
> -- >8 --
>
>>
>> if (!dst)
>> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
>> index 718efa0..7bac2bc 100755
>> --- a/t/t0021-conversion.sh
>> +++ b/t/t0021-conversion.sh
>> @@ -252,4 +252,20 @@ test_expect_success "filter: smudge empty file" '
>> test_cmp expected filtered-empty-in-repo
>> '
>>
>> +test_expect_success 'disable filter with empty override' '
>> + test_config_global filter.disable.smudge false &&
>> + test_config_global filter.disable.clean false &&
>> + test_config filter.disable.smudge false &&
>> + test_config filter.disable.clean false &&
>> +
>> + echo "*.disable filter=disable" >.gitattributes &&
>> +
>> + echo test >test.disable &&
>> + git -c filter.disable.clean= add test.disable 2>err &&
>> + test_must_be_empty err &&
>> + rm -f test.disable &&
>> + git -c filter.disable.smudge= checkout -- test.disable 2>err &&
>> + test_must_be_empty err
>> +'
>> +
>> test_done
next prev parent reply other threads:[~2016-01-29 18:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-29 8:21 [PATCH v2] convert: legitimately disable clean/smudge filter with an empty override larsxschneider
2016-01-29 8:21 ` larsxschneider
2016-01-29 18:20 ` Junio C Hamano
2016-01-29 18:48 ` Junio C Hamano [this message]
2016-01-29 18:55 ` Lars Schneider
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=xmqqwpqsi5m0.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.