[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>

diff --git a/show-diff.c b/show-diff.c
index a00ee72e11edf366a803997e58b822d3b8dab469..1f903af0279a545c1c679892a8a94a53d3dc162d 100644 (file)
--- 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;