From: "J. Bruce Fields" <bfields@fieldses.org>
To: Nanako Shiraishi <nanako3@lavabit.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Michael J Gruber <git@drmicha.warpmail.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Hannu Koivisto <azure@iki.fi>,
Jeff King <peff@peff.net>, Wincent Colaiuta <win@wincent.com>,
Matthias Lederhofer <matled@gmx.net>
Subject: Re: [PATCH v2 0/2] user-manual: new "getting started" section
Date: Tue, 17 Nov 2009 12:28:15 -0500 [thread overview]
Message-ID: <20091117172815.GH31767@fieldses.org> (raw)
In-Reply-To: <20091117210625.6117@nanako3.lavabit.com>
On Tue, Nov 17, 2009 at 09:06:25PM +0900, Nanako Shiraishi wrote:
> David's proposal introduced two magic tokens STAGE and WORKTREE.
>
> git diff STAGE WORKTREE (like "git diff" today)
> git diff HEAD WORKTREE (like "git diff HEAD" today)
> git diff WORKTREE HEAD (like "git diff -R HEAD" today)
> git diff HEAD STAGE (like "git diff --cached" today)
> git diff commit STAGE (like "git diff --cached commit" today)
>
> This looks nice on surface, but I think the apparent niceness
> is shallow. If of course has a small problem of introducing an
> obvious backward incompatibility. You can't use a branch whose
> name is STAGE anymore, but a deeper problem is that these two
> magic tokens pretend to be refs. But they do so only to the diff
> command. I don't see how you can make them sanely be usable to
> other commands like "git log v1.0.0..WORKTREE".
Doesn't appear that refs have to point to commits; e.g., on the linux
project:
git log v2.6.11-tree..v2.6.32-rc7
error: Object 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c is a tree, not a
commit
fatal: Invalid revision range v2.6.11-tree..v2.6.32-rc7
You might be able to add some extra syntax to prevent conflicts with
branch names. Uh, :STAGE, :WORKTREE ?? But I think that conflicts with
something else. And the "magic tokens" get a little uglier and harder
to remember. Bah.
--b.
next prev parent reply other threads:[~2009-11-17 17:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-24 9:44 [PATCH v2 0/2] user-manual: new "getting started" section Felipe Contreras
2009-10-24 9:44 ` [PATCH v2 1/2] user-manual: add global config section Felipe Contreras
2009-10-24 9:44 ` [PATCH v2 2/2] user-manual: simplify the user configuration Felipe Contreras
2009-10-24 13:06 ` [PATCH v2 0/2] user-manual: new "getting started" section Nanako Shiraishi
2009-10-24 14:08 ` Felipe Contreras
2009-10-24 14:14 ` Björn Steinbrink
2009-10-24 14:22 ` Felipe Contreras
2009-10-24 17:51 ` Junio C Hamano
2009-10-24 18:19 ` Junio C Hamano
2009-10-24 20:16 ` Felipe Contreras
2009-10-25 0:26 ` J. Bruce Fields
2009-10-25 3:08 ` Junio C Hamano
2009-10-25 9:43 ` Felipe Contreras
2009-10-25 11:14 ` Jonathan Nieder
2009-11-11 23:15 ` Felipe Contreras
2009-11-12 11:29 ` Michael J Gruber
2009-11-12 20:04 ` Felipe Contreras
2009-11-13 21:06 ` Nanako Shiraishi
2009-11-16 22:52 ` Felipe Contreras
2009-11-17 12:06 ` Nanako Shiraishi
2009-11-17 17:28 ` J. Bruce Fields [this message]
2009-11-17 18:25 ` Junio C Hamano
2009-11-17 22:00 ` Felipe Contreras
2009-11-17 22:19 ` Junio C Hamano
2009-11-17 23:06 ` Felipe Contreras
2009-11-17 23:13 ` Junio C Hamano
2009-11-18 0:05 ` Felipe Contreras
2009-11-17 17:53 ` Matthieu Moy
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=20091117172815.GH31767@fieldses.org \
--to=bfields@fieldses.org \
--cc=azure@iki.fi \
--cc=felipe.contreras@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=matled@gmx.net \
--cc=nanako3@lavabit.com \
--cc=peff@peff.net \
--cc=win@wincent.com \
/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).