From: Stefan Hajnoczi <stefanha@redhat.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [RFC 2/2] grep: use '/' delimiter for paths
Date: Mon, 23 Jan 2017 13:29:18 +0000 [thread overview]
Message-ID: <20170123132918.GM29186@stefanha-x1.localdomain> (raw)
In-Reply-To: <xmqq60l9wdb9.fsf@gitster.mtv.corp.google.com>
[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]
On Fri, Jan 20, 2017 at 02:56:26PM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > It's not ignored; just as with git-log, it's a pathspec to limit the
> > diff. E.g.:
> >
> > $ git show --name-status v2.9.3
> > ...
> > M Documentation/RelNotes/2.9.3.txt
> > M Documentation/git.txt
> > M GIT-VERSION-GEN
> >
> > $ git show --name-status v2.9.3 -- Documentation
> > M Documentation/RelNotes/2.9.3.txt
> > M Documentation/git.txt
> >
> > That's typically less useful than it is with log (where limiting the
> > diff also kicks in history simplification and omits some commits
> > entirely). But it does do something.
>
> I think Stefan is missing the fact that the argument to "git show
> <tree-ish>:<path>" actually is naming a blob that sits at the <path>
> in the <tree-ish>. In other words, "show" is acting as a glorified
> "git -p cat-file blob", in that use.
>
> The use of "git show" you are demonstrating is still about showing
> the commit object, whose behaviour is defined to show the log
> message and the diff relative to its sole parent, limited to the
> paths that match the pathspec.
>
> It is perfectly fine and desirable that "git show <commit>:<path>"
> and "git show <commit> -- <path>" behaves differently. These are
> two completely different features.
Thanks for explaining guys. It all makes logical sense. I just hope I
remember the distinctions in that table for everyday git use.
Stefan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
next prev parent reply other threads:[~2017-01-24 9:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 15:03 [RFC 0/2] grep: make output consistent with revision syntax Stefan Hajnoczi
2017-01-19 15:03 ` [RFC 1/2] grep: only add delimiter if there isn't one already Stefan Hajnoczi
2017-01-19 18:39 ` Junio C Hamano
2017-01-20 13:56 ` Stefan Hajnoczi
2017-01-20 18:16 ` Junio C Hamano
2017-01-23 13:15 ` Stefan Hajnoczi
2017-01-24 19:07 ` Jakub Narębski
2017-01-24 20:48 ` Philip Oakley
2017-01-19 15:03 ` [RFC 2/2] grep: use '/' delimiter for paths Stefan Hajnoczi
2017-01-19 18:29 ` Brandon Williams
2017-01-20 14:17 ` Stefan Hajnoczi
2017-01-19 18:54 ` Junio C Hamano
2017-01-20 14:12 ` Stefan Hajnoczi
2017-01-20 14:19 ` Jeff King
2017-01-20 22:56 ` Junio C Hamano
2017-01-23 13:29 ` Stefan Hajnoczi [this message]
2017-01-24 17:18 ` Phil Hord
2017-01-19 16:59 ` [RFC 0/2] grep: make output consistent with revision syntax Jeff King
2017-01-19 18:26 ` Brandon Williams
2017-01-20 14:18 ` Stefan Hajnoczi
2017-01-20 14:32 ` Jeff King
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=20170123132918.GM29186@stefanha-x1.localdomain \
--to=stefanha@redhat.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).