X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=revision.c;h=1f4590b89649a9d1397af2f35af142cc6ab36847;hb=952c8c56380734d45bddf369fe478895672c5a3a;hp=b12c25e2b0c8e2c1d3bb097739f3c132a296c964;hpb=89dd19e107455ee680b4d0e027998f0608840fe8;p=git.git

diff --git a/revision.c b/revision.c
index b12c25e2b..1f4590b89 100644
--- 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;
 			}