From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: git-checkout-index, flag ordering and --prefix kludgy handling
Date: Mon, 17 Oct 2005 19:48:07 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0510171933200.3369@g5.osdl.org> (raw)
In-Reply-To: <7vmzl7tv89.fsf@assigned-by-dhcp.cox.net>
On Mon, 17 Oct 2005, Junio C Hamano wrote:
>
> One reason I have not done nor said much about this was because
> I've been thinking about making the branch/refname more explicit
> on our command line.
Yes, I know it's ambigious at times, but it really is very convenient.
Usually we allow a "--" to say where a filename starts when it _is_
ambiguous.
However, you're right, we fail that at times. In particular, git-rev-parse
fails it.
Something like this?
Linus
---
diff --git a/rev-parse.c b/rev-parse.c
index 41b9dae..85230df 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -151,6 +151,12 @@ static void show_datestring(const char *
show(buffer);
}
+static void show_file(const char *arg)
+{
+ if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
+ show(arg);
+}
+
int main(int argc, char **argv)
{
int i, as_is = 0, verify = 0;
@@ -162,7 +168,7 @@ int main(int argc, char **argv)
char *dotdot;
if (as_is) {
- show(arg);
+ show_file(arg);
continue;
}
if (*arg == '-') {
@@ -282,9 +288,7 @@ int main(int argc, char **argv)
}
if (verify)
die("Needed a single revision");
- if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
- (DO_NONFLAGS|DO_NOREV))
- show(arg);
+ show_file(arg);
}
show_default();
if (verify && revs_count != 1)
next prev parent reply other threads:[~2005-10-18 2:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-16 19:14 git-checkout-index, flag ordering and --prefix kludgy handling Blaisorblade
2005-10-17 22:58 ` Junio C Hamano
2005-10-17 22:58 ` Linus Torvalds
2005-10-18 0:33 ` Junio C Hamano
2005-10-18 1:28 ` Linus Torvalds
2005-10-18 2:27 ` Junio C Hamano
2005-10-18 2:48 ` Linus Torvalds [this message]
2005-10-18 5:49 ` Teach "git diff" to handle filenames startign with '-' Linus Torvalds
2005-10-18 5:57 ` Handle "-" at beginning of filenames, part 3 Linus Torvalds
2005-10-18 8:34 ` [PATCH] git-checkout: revert specific paths to either index or a given tree-ish 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
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=Pine.LNX.4.64.0510171933200.3369@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
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).