Re: Undocumented git-diff syntax

From: Yann Dirson <dirson@bertin.fr>
Date: Oct 11, 2010, 14:17 UTC
Message-ID: <20101011161721.35940919@chalon.bertin.fr>
In-Reply-To: <AANLkTinqPiGf1nbo0oOvDD5edgLBdO8xZfjGeFC4q0MU@mail.gmail.com>

On Mon, 11 Oct 2010 15:59:18 +0200 Santi Béjar <santi@agolina.net> wrote:

Show 14 quoted lines

> On Mon, Oct 11, 2010 at 3:03 PM, Yann Dirson <dirson@bertin.fr> wrote:
> [...]
> >
> > Another thought: if we can already compare arbitrary blobs, maybe
> > it would not be so hard to extend it to take arbitrary contents
> > that are not stored as blobs yet ?  (a quick hack would be to
> > insert an object for them, but that does not look too clean...).
> >  As a use-case, I'm often found generating diffs from within custom
> > scripts, from contents derived from a git repo, but can't use all
> > the bells and whistles (--color, --color-words, etc), just because
> > I have to use plain diff; that makes the output of those scripts
> > very inconsistent with native git commands.
> 
> Are you talking about "git diff --no-index"?

Oh, right. That's what it takes to read only the 1st paragraph for each synopsis:

|If exactly two paths are given, and at least one is untracked,
|compare the two files / directories. This behavior can be
|forced by --no-index.

OTOH, that appears not to be 100% accurate (my tests would have shown me): although --no-index does give me the expected results when one or two of the files are untracked, I have to explicitely add it, which seem to contradict this part of the doc.

That said, this two-path construct would surely deserve its own synopsis.

To get back to my initial opuzzlement, maybe the behaviour I found is also a special case that sets --no-index ?

-- 
Yann Dirson - Bertin Technologies