Re: [PATCH] docs: explain diff.*.binary option

From: Jeff King <peff@peff.net>
Date: Jan 11, 2011, 06:11 UTC
Message-ID: <20110111061114.GE10094@sigill.intra.peff.net>
In-Reply-To: <7vpqs463o4.fsf@alter.siamese.dyndns.org>

On Mon, Jan 10, 2011 at 09:59:07AM -0800, Junio C Hamano wrote:

Show 15 quoted lines

> Thanks.  I take it that this documents 122aa6f (diff: introduce
> diff.<driver>.binary, 2008-10-05) where you said...
> 
>     This patch introduces a "binary" config option for a diff
>     driver, so that one can explicitly set diff.foo.binary. We
>     default this value to "don't know". That is, setting a diff
>     attribute to "foo" and using "diff.foo.funcname" will have
>     no effect on the binaryness of a file. To get the current
>     behavior, one can set diff.foo.binary to true.
> 
> I am scratching my head about the last sentence, though.  Shouldn't that
> be "false"?  In the olden days, setting diff.foo.funcname made it text but
> with this change it no longer is the case and instead binaryness is
> determined by content inspection, so forcing "text" needs to be done by
> saying "this is _not_ binary", no?

Yeah, that definitely should be "false". I think it was simply a think-o when typing the commit message (and I just did a quick test to double check that the behavior described by the message is in fact what happens).

Reading that thread, too, I think I was a little confused at first back then about how diff.*.binary would be used with respect to textconv, but between some thinking and JSixt beating some sense into me, it came out with at least the correct semantics, if not an accurate commit message. :)

-Peff