git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: [RFC] get_sha1() shorthands for blob/tree objects
Date: Tue, 18 Apr 2006 18:30:02 -0700	[thread overview]
Message-ID: <7vd5fecpyd.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0604181805080.3701@g5.osdl.org> (Linus Torvalds's message of "Tue, 18 Apr 2006 18:16:10 -0700 (PDT)")

Linus Torvalds <torvalds@osdl.org> writes:

> Now, the thing that an internal "git diff" could do better is to notice 
> when it gets _one_ blob revision, and one filename, ie we could do
>
> 	git diff v0.99.6:git-commit-script git-commit.sh
>
> which parses as one SHA1 of a blob (put onto the rev.pending_objects 
> list), and one filename (in the rev.prune_data array). We could decide to 
> automatically do the "right thing" for that case too.

The "right thing" is ambiguous, I am afraid.

I think it would be natural to interpret the request as a diff
between the blob from v0.99.6 and a random working tree file, 
which may not even exist in the index.

However I suspect what you are getting at is to act as if the
user said:

	git diff v0.99.6:git-commit-script HEAD:git-commit.sh

Oh, another possibility is to act as if the user said

	git diff v0.99.6:this :git-commit.sh

where "(empty):" would stand for "look up in the index, not in a
tree".

I think these are all valid interpretations and there are useful
use cases (admittably the last one is "diff-cache --cached").

Unfortunatly, I do not think this parses well:

	git diff git-commit.sh v0.99.6:git-commit-script

but you could always say:

	git diff -R v0.99.6:git-commit-script git-commit.sh

  parent reply	other threads:[~2006-04-19  1:30 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-18 23:45 [RFC] get_sha1() shorthands for blob/tree objects Linus Torvalds
2006-04-19  0:14 ` Martin Langhoff
2006-04-19  0:21   ` Shawn Pearce
2006-04-19  1:20     ` Ray Lehtiniemi
2006-04-19  0:27 ` Junio C Hamano
2006-04-19  0:44   ` Linus Torvalds
2006-04-19  0:47     ` Linus Torvalds
2006-04-19  8:15       ` Andreas Ericsson
2006-04-19 14:44         ` Linus Torvalds
2006-04-19  0:56 ` Junio C Hamano
2006-04-19  1:16   ` Linus Torvalds
2006-04-19  1:19     ` Linus Torvalds
2006-04-19  1:30     ` Junio C Hamano [this message]
2006-04-19  1:43       ` Linus Torvalds
2006-04-19  4:02         ` Junio C Hamano
2006-04-19  4:14           ` Linus Torvalds
2006-04-19 21:49             ` Junio C Hamano
2006-04-19 21:57               ` Linus Torvalds
2006-04-19  3:51       ` Martin Langhoff
2006-04-19  3:58         ` Linus Torvalds
2006-04-19  4:04           ` Linus Torvalds
2006-04-22  0:49 ` [RFC] get_sha1(): :path and :[0-3]:path to extract from index Junio C Hamano
2006-04-25  8:37   ` Uwe Zeisberger
2006-04-25  8:46     ` Junio C Hamano

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=7vd5fecpyd.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.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).