From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH] show-diff style fix.
Date: Sat, 16 Apr 2005 19:15:10 -0700 [thread overview]
Message-ID: <7voece2lox.fsf@assigned-by-dhcp.cox.net> (raw)
This fixes some stylistic problems introduced by my previous set
of patches. I'll be sending my last patch to show-diff next,
which depends on this cleanup.
To be applied on top of my previous patches:
[PATCH] Optionally tell show-diff to show only named files.
[PATCH] show-diff -z option for machine readable output.
[PATCH] show-diff shell safety.
[PATCH] (take 2) Rename confusing variable in show-diff.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
show-diff.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
--- ./show-diff.c 2005-04-16 18:59:09.000000000 -0700
+++ ./show-diff.c 2005-04-16 19:01:28.000000000 -0700
@@ -111,7 +111,7 @@
}
}
-static const char *show_diff_usage = "show-diff [-s] [-q] [-z] [paths...]";
+static const char *show_diff_usage = "show-diff [-q] [-s] [-z] [paths...]";
static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
{
@@ -141,9 +141,8 @@
silent_on_nonexisting_files = silent = 1;
else if (!strcmp(argv[1], "-q"))
silent_on_nonexisting_files = 1;
- else if (!strcmp(argv[1], "-z")) {
+ else if (!strcmp(argv[1], "-z"))
machine_readable = 1;
- }
else
usage(show_diff_usage);
argv++; argc--;
@@ -164,7 +163,7 @@
char type[20];
void *old;
- if (1 <argc &&
+ if (1 < argc &&
! matches_pathspec(ce, argv+1, argc-1))
continue;
reply other threads:[~2005-04-17 2:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=7voece2lox.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