X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=revision.c;h=7834bb108e27a819a4a619a85123443f254d421d;hb=0cae23467ada9b94210a0e770064841efea8ad40;hp=b12c25e2b0c8e2c1d3bb097739f3c132a296c964;hpb=9bfe9f80b1f57dd5bd63c94516fb8aa820fef1cd;p=git.git

diff --git a/revision.c b/revision.c
index b12c25e2b..7834bb108 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;
 			}
@@ -1229,7 +1230,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 
 	if (revs->prune_data) {
 		diff_tree_setup_paths(revs->prune_data, &revs->pruning);
-		revs->prune_fn = try_to_simplify_commit;
+		/* Can't prune commits with rename following: the paths change.. */
+		if (!revs->diffopt.follow_renames)
+			revs->prune_fn = try_to_simplify_commit;
 		if (!revs->full_diff)
 			diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
 	}