summaryrefslogtreecommitdiff
path: root/show-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-17 04:29:45 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 04:29:45 (GMT)
commitd2522a6528a1212933e71c592950097bcfe64e7d (patch)
treec9a4eba919aaf1bd98209dfaad43776fae171951 /show-diff.c
parentb70c8942d3fab4dff86461919a8c18eb3d020cea (diff)
downloadgit-d2522a6528a1212933e71c592950097bcfe64e7d.zip
git-d2522a6528a1212933e71c592950097bcfe64e7d.tar.gz
git-d2522a6528a1212933e71c592950097bcfe64e7d.tar.bz2
[PATCH] show-diff style fix.
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. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'show-diff.c')
-rw-r--r--show-diff.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/show-diff.c b/show-diff.c
index a00ee72..1f903af 100644
--- a/show-diff.c
+++ b/show-diff.c
@@ -111,7 +111,7 @@ static void show_diff_empty(struct cache_entry *ce)
}
}
-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 @@ int main(int argc, char **argv)
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 @@ int main(int argc, char **argv)
char type[20];
void *old;
- if (1 <argc &&
+ if (1 < argc &&
! matches_pathspec(ce, argv+1, argc-1))
continue;