git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Usability improvement request: git show revision -- file
Date: Thu, 31 Mar 2011 21:59:24 +0200	[thread overview]
Message-ID: <AANLkTimkdRtY_2S1U=Kog08EOAx_U2cgAFdEC60AZ4eO@mail.gmail.com> (raw)
In-Reply-To: <4D94322A.8030409@drmicha.warpmail.net>

On Thu, Mar 31, 2011 at 9:50 AM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Piotr Krukowiecki venit, vidit, dixit 31.03.2011 08:45:
>> Hi,
>>
>> if there's existing way to do this please tell me.
>>
>> There's this file "src/subdir/file". I'm in the "src" directory and want to
>> see the "file" at specific revision.
>>
>> Knowing about git show I'd expect something like this to work:
>>
>>    $ git show master -- subdir/file
>>
>> But it shows nothing (no output, no warning).
>
> ...because you are asking git to show the commit master, filtered by
> subdir/file, and if that file is not changed there, the commit is not

It wasn't - I was doing git-blame and wanted to see file as it was before
the blamed commit.


> selected. If it is changed there, it shows you only the diff affecting

I see - that makes sense too.


> that file. (We might want to change this to filter the diff only.)

Not sure what you mean by that?


>> Following also does not
>> work as expected:
>>
>>    $ git show master:subdir/file
>>    fatal: Path 'src/subdir/file' exists, but not 'subdir/file'.
>>    Did you mean 'master:src/subdir/file'?
>
> But git is really understanding about your situation, isn't it? ;)

Yeah, but this looks like a workround for a common problem -
people specify relative path a lot, so a warning was added.


>> Of course following works:
>>
>>    $ git show master:src/subdir/file
>>
>> but it's not very convenient to have to specify full path, and it's not what
>> you would expect given that most other commands accept "-- relativepath"
>> syntax.
>
> It's not the command in this case, but the "commit:pathspec" syntax, and
> for every command which understands it, it is relative to root (i.e.
> expects a full path). But we do have a syntax for relative:
>
> git show master:./subdir/file

Thanks, I'll try to remember. I don't have a better idea for solving
this problem.


-- 
Piotr Krukowiecki

      parent reply	other threads:[~2011-03-31 19:59 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-31  6:45 Usability improvement request: git show revision -- file Piotr Krukowiecki
2011-03-31  7:50 ` Michael J Gruber
2011-03-31  9:17   ` [PATCH 1/3] t1506: factor out test for "Did you mean..." Michael J Gruber
2011-03-31  9:17     ` [PATCH 2/3] sha1_name: Suggest commit:./file for path in subdir Michael J Gruber
2011-03-31 19:26       ` Junio C Hamano
2011-04-01  6:52         ` Michael J Gruber
2011-04-01 19:11           ` Junio C Hamano
2011-03-31  9:17     ` [RFC/PATCH 3/3] builtin/show.c: do not prune by pathspec Michael J Gruber
2011-03-31 10:18       ` Johannes Sixt
2011-03-31 10:58         ` Michael J Gruber
2011-03-31 11:42           ` Johannes Sixt
2011-03-31 12:07             ` Michael J Gruber
2011-03-31 12:50       ` Nguyen Thai Ngoc Duy
2011-03-31 13:26         ` Michael J Gruber
2011-03-31 13:35           ` Nguyen Thai Ngoc Duy
2011-03-31 13:55             ` Michael J Gruber
2011-03-31 19:23           ` Junio C Hamano
2011-04-01  6:46             ` Michael J Gruber
2011-04-01  9:20             ` [PATCH 0/4] reflog, show and command line overrides Michael J Gruber
2011-04-01  9:20               ` [PATCH 1/4] builtin/log.c: separate default and setup of cmd_log_init() Michael J Gruber
2011-04-01  9:20               ` [PATCH 2/4] t/t1411: test reflog with formats Michael J Gruber
2011-04-01  9:20               ` [PATCH 3/4] reflog: fix overriding of command line options Michael J Gruber
2011-04-01  9:20               ` [PATCH 4/4] builtin/show: do not prune by pathspec Michael J Gruber
2011-04-01 21:50                 ` Junio C Hamano
2011-04-01 22:59                   ` Junio C Hamano
2011-04-03 13:16                     ` Michael J Gruber
2011-04-04 21:49                 ` Junio C Hamano
2011-04-05  6:06                   ` Michael J Gruber
2011-03-31 19:59   ` Piotr Krukowiecki [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='AANLkTimkdRtY_2S1U=Kog08EOAx_U2cgAFdEC60AZ4eO@mail.gmail.com' \
    --to=piotr.krukowiecki@gmail.com \
    --cc=git@drmicha.warpmail.net \
    --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).