From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Teach "git diff" to handle filenames startign with '-'
Date: Mon, 17 Oct 2005 22:49:27 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0510172243560.3369@g5.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0510171933200.3369@g5.osdl.org>
It adds "--" to the git-diff.sh scripts, to keep any filenames that start
with a "-" from being confused with an option.
But in order to do that, it needs to teach git-diff-files to honor "--".
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
On Mon, 17 Oct 2005, Linus Torvalds wrote:
>
> 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.
This is on top of the rev-parse.c diff (it's strictly independent, but it
needs the rev-parse.c one to make any sense, since without the rev-parse.c
fix for -- handling, "git diff" won't work regardless).
diff --git a/diff-files.c b/diff-files.c
index 8a8f9b6..1789939 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -41,6 +41,11 @@ int main(int argc, const char **argv)
git_config(git_default_config);
diff_setup(&diff_options);
while (1 < argc && argv[1][0] == '-') {
+ if (!strcmp(argv[1], "--")) {
+ argv++;
+ argc--;
+ break;
+ }
if (!strcmp(argv[1], "-q"))
silent = 1;
else if (!strcmp(argv[1], "-r"))
diff --git a/git-diff.sh b/git-diff.sh
index 84a152a..b3ec84b 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -28,16 +28,16 @@ case "$rev" in
?*' '^?*)
begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
end=$(expr "$rev" : '.\([0-9a-f]*\). .*') || exit
- cmd="git-diff-tree $flags $begin $end $files"
+ cmd="git-diff-tree $flags $begin $end -- $files"
;;
?*' '?*)
- cmd="git-diff-tree $flags $rev $files"
+ cmd="git-diff-tree $flags $rev -- $files"
;;
?*' ')
- cmd="git-diff-index $flags $rev $files"
+ cmd="git-diff-index $flags $rev -- $files"
;;
'')
- cmd="git-diff-files $flags $files"
+ cmd="git-diff-files $flags -- $files"
;;
*)
die "I don't understand $*"
next prev parent reply other threads:[~2005-10-18 5:50 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
2005-10-18 5:49 ` Linus Torvalds [this message]
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.0510172243560.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).