Merge branch 'maint' to sync with GIT 1.5.2.2

2007-06-16 01:22:10 -07:00
parent c5f71ad099 c7c84859ad
commit 5bd148bfe8
10 changed files with 109 additions and 6 deletions
--- a/revision.c
+++ b/revision.c
@ -1180,7 +1180,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch

 			opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
 			if (opts > 0) {
-				revs->diff = 1;
+				if (strcmp(argv[i], "-z"))
+					revs->diff = 1;
 				i += opts - 1;
 				continue;
 			}