git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Arjen Laarhoven <arjen@yaph.org>
Cc: git@vger.kernel.org
Subject: Re: git diff-tree output inconsistency?
Date: Thu, 7 Apr 2011 15:08:32 -0400	[thread overview]
Message-ID: <20110407190832.GA18842@sigill.intra.peff.net> (raw)
In-Reply-To: <20110407135938.GA322@regex.yaph.org>

On Thu, Apr 07, 2011 at 03:59:38PM +0200, Arjen Laarhoven wrote:

> I was fiddling with the git-diff-tree command to retrieve a list of
> files which have in a commit:
> 
> $ git diff-tree --name-only HEAD
> 
> According to the documentation, the output starts with the SHA-1 of the
> tree-ish given, after which the list of changed files follows.  This is
> the case when just one commit-id is given.
> 
> However, when given 2 tree-ish objects, the separate line with the SHA-1
> is not shown.
> 
> I browsed through the code and the history for diff-tree.c, but couldn't
> find an explanation for the inconsistency.  The documentation for the
> --no-commit-id confuses me a bit more, as it states that the commit id
> is shown 'when applicable'.  Unfortunately, it fails to explain when
> exactly that is :-)
> 
> Have I found a documentation bug/shortcoming, is it a code bug or am I
> misunderstanding something else?

I think it's a documentation bug. The sha1 is shown only when a single
tree-ish is given (either on the command line, or via --stdin). This is
a historical behavior, as one of the original uses of diff-tree was
to implement log as:

  git rev-list | git diff-tree --stdin

You can even do "git diff-tree --stdin --pretty=medium" to get the full
log-ish output.  These days, though, log does everything in one process.

But I don't think we make that clear anywhere in the diff-tree manpage.

-Peff

      reply	other threads:[~2011-04-07 19:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-07 13:59 git diff-tree output inconsistency? Arjen Laarhoven
2011-04-07 19:08 ` 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=20110407190832.GA18842@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=arjen@yaph.org \
    --cc=git@vger.kernel.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).