git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Dana How" <danahow@gmail.com>
To: "Linus Torvalds" <torvalds@linux-foundation.org>
Cc: "Jakub Narebski" <jnareb@gmail.com>,
	"Alex Riesen" <raa.lkml@gmail.com>,
	git@vger.kernel.org, "Junio C Hamano" <junkio@cox.net>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	danahow@gmail.com
Subject: Re: log/show: relative pathnames do not work in rev:path
Date: Tue, 18 Dec 2007 14:08:33 -0800	[thread overview]
Message-ID: <56b7f5510712181408g4aee55d2j2a7f0f13bf90323d@mail.gmail.com> (raw)
In-Reply-To: <alpine.LFD.0.9999.0712181347140.21557@woody.linux-foundation.org>

On Dec 18, 2007 1:53 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Tue, 18 Dec 2007, Jakub Narebski wrote:
> >
> > What cwd? <path> in <tree-ish>:<path> syntax is "relative" to <tree-ish>.
> > IMHO "<tree-ish>:<path>" should be considered (and is considered) as
> > one object: current working directory doesn't matter at all there,
> > contrary to "<tree-ish> -- <pathspec>" where it is natural that <pathspec>
> > is relative to current working directory.
>
> Indeed.
>
> The <treeish>:<path> syntax *is* relative, but it's relative to the exact
> *treeish* that is given. It has nothing what-so-ever to do with the
> current working directory, since the user has explicitly given an exact
> tree object, and trying to fake that out would be actively wrong.

I think the solution is to use the cwd only when the tree-ish refers
to a commit.
If it refers explicitly to a tree (or to a tree through a tag w/o
going through a commit)
then you don't make any modification.

When it *does* refer to a commit,  then for commit:relpath you prefix
relpath with the suffix of the cwd which is an extension beyond the root
of the working tree.

At the time I thought this through submodules didn't exist.
Clearly that case needs to be thought through as well.

> That said, I can kind of understand the wish for something like this, and
> I suspect that we could make the "commit->tree" translation take the
> current path into account. In other words, maybe we should have something
> like this:
>
>         /*
>          * This sequence currently works
>          */
>         [torvalds@woody git]$ git rev-parse HEAD
>         f9c5a80cdf2265f2df7712fad9f1fb7ef68b4768
>
>         [torvalds@woody git]$ git rev-parse HEAD^{tree}
>         051fb0c0dff4371f97f8ad9407f9f1fd335b1682
>
>         [torvalds@woody git]$ git rev-parse HEAD^{tree}:t
>         49d8bcd7a2df5c17193b1d002c4a8489d4fa990c
>
>         /*
>          * .. but this would be new
>          */
>         [torvalds@woody git]$ cd t
>         [torvalds@woody t]$ git rev-parse HEAD^{tree}
>         49d8bcd7a2df5c17193b1d002c4a8489d4fa990c
>
> where the magic is *not* done by any "SHA1 path lookup" at all, but is
> simply done by the commit->tree lookup. At least at that point it would
> make logical sense (although it would probably be quite painful to
> implement).

I must be missing something.  The old patch I submitted did this.
Its defect was that it did NOT make the cwd insertion conditional
on whether the tree-ish involved a commit or not (a test which also
_seems_ doable,  but I don't think I finished it & sent it in).

Thanks,
-- 
Dana L. How  danahow@gmail.com  +1 650 804 5991 cell

  reply	other threads:[~2007-12-18 22:09 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-18 17:33 log/show: relative pathnames do not work in rev:path Alex Riesen
2007-12-18 17:50 ` Jakub Narebski
2007-12-18 20:46   ` Alex Riesen
2007-12-18 20:47     ` [PATCH] Simple support for tree entry specification with relative pathnames Alex Riesen
2007-12-18 20:49       ` [PATCH] Introduce pathexpand: syntax-level chdir into the given cwd Alex Riesen
2007-12-18 20:52         ` [PATCH] Use pathexpand to preparse the relative pathnames in blob references Alex Riesen
2007-12-18 21:06           ` Dana How
2007-12-19 14:37           ` Jeff King
2007-12-18 21:03       ` [PATCH] Simple support for tree entry specification with relative pathnames Dana How
2007-12-18 21:17         ` Alex Riesen
     [not found]           ` <56b7f5510712181539g27bd4fc9y632ebe74d91b8e82@mail.gmail.com>
2007-12-19  7:36             ` Alex Riesen
2007-12-18 21:24     ` log/show: relative pathnames do not work in rev:path Jakub Narebski
2007-12-18 21:53       ` Linus Torvalds
2007-12-18 22:08         ` Dana How [this message]
2007-12-18 22:29           ` Alex Riesen
2007-12-18 22:20         ` Junio C Hamano
2007-12-18 22:30           ` Dana How
2007-12-18 23:02             ` Johannes Schindelin
2007-12-19 20:45             ` Junio C Hamano
2007-12-18 22:20       ` Alex Riesen
2007-12-18 22:43         ` Johannes Schindelin
2007-12-18 23:03           ` Dana How
2007-12-18 23:26             ` Johannes Schindelin
2007-12-19  1:16             ` Linus Torvalds
2007-12-19  1:52               ` Dana How
2007-12-19  7:42                 ` Alex Riesen
2007-12-19 11:23                 ` Jakub Narebski
2007-12-19 17:21                   ` Dana How
2007-12-19 18:47                     ` Jakub Narebski
2007-12-19 13:40                 ` [PATCH v0] sha1_name: grok <revision>:./<relative-path> Johannes Schindelin
2007-12-19 15:05                   ` Jeff King
2007-12-19 17:40                     ` Dana How
2007-12-19 18:09                       ` Alex Riesen
2007-12-20  1:07                   ` Junio C Hamano
2007-12-20 10:51                     ` Johannes Schindelin
2007-12-21 14:17                   ` Nguyen Thai Ngoc Duy
2007-12-21 17:50                     ` Junio C Hamano
2007-12-21 20:15                       ` Nguyen Thai Ngoc Duy
2007-12-22 14:33                     ` Johannes Schindelin
2007-12-18 23:11           ` log/show: relative pathnames do not work in rev:path Jakub Narebski
2007-12-18 23:15             ` Dana How
2007-12-18 23:18           ` Junio C Hamano
2007-12-18 23:05         ` Jakub Narebski

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=56b7f5510712181408g4aee55d2j2a7f0f13bf90323d@mail.gmail.com \
    --to=danahow@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    --cc=junkio@cox.net \
    --cc=raa.lkml@gmail.com \
    --cc=torvalds@linux-foundation.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.
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).