git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>, git@vger.kernel.org
Subject: Re: [PATCH] docs: explain diff.*.binary option
Date: Tue, 11 Jan 2011 01:11:14 -0500	[thread overview]
Message-ID: <20110111061114.GE10094@sigill.intra.peff.net> (raw)
In-Reply-To: <7vpqs463o4.fsf@alter.siamese.dyndns.org>

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

> 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

      reply	other threads:[~2011-01-11  6:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-04 15:50 PostScript files: textconv and "git add -p" Matthieu Moy
2011-01-05  5:18 ` Jeff King
2011-01-09 18:55   ` Matthieu Moy
2011-01-09 20:10     ` [PATCH] docs: explain diff.*.binary option Jeff King
2011-01-09 20:31       ` Matthieu Moy
2011-01-10 17:59       ` Junio C Hamano
2011-01-11  6:11         ` Jeff King [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=20110111061114.GE10094@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).