From: Junio C Hamano <junkio@cox.net>
Date: Sun, 17 Apr 2005 04:29:45 +0000 (-0700)
Subject: [PATCH] show-diff style fix.
X-Git-Tag: v0.99~858
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d2522a6528a1212933e71c592950097bcfe64e7d;p=git.git

[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 a00ee72e1..1f903af02 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;