X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=dbd54da5baec5b5a2320a40a66da24541705e971;hb=d3d9681a0fc23a47d48b5df296cd267b0b6055b2;hp=3cd6a2ed9f978776b2a021747f3f0995ebb70b28;hpb=e5de825fda5795c2607ae870fcc4369db1ae77c2;p=git.git

diff --git a/revision.c b/revision.c
index 3cd6a2ed..dbd54da5 100644
--- a/revision.c
+++ b/revision.c
@@ -498,7 +498,6 @@ void init_revisions(struct rev_info *revs)
 	revs->topo_setter = topo_sort_default_setter;
 	revs->topo_getter = topo_sort_default_getter;
 
-	revs->header_prefix = "";
 	revs->commit_format = CMIT_FMT_DEFAULT;
 
 	diff_setup(&revs->diffopt);
@@ -675,12 +674,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 			}
 			if (!strcmp(arg, "-v")) {
 				revs->verbose_header = 1;
-				revs->header_prefix = "diff-tree ";
 				continue;
 			}
 			if (!strncmp(arg, "--pretty", 8)) {
 				revs->verbose_header = 1;
-				revs->header_prefix = "diff-tree ";
 				revs->commit_format = get_commit_format(arg+8);
 				continue;
 			}
@@ -794,8 +791,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 		if (revs->dense_combined_merges)
 			revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 	}
-	if (revs->diffopt.output_format == DIFF_FORMAT_PATCH)
-		revs->diffopt.recursive = 1;
 	revs->diffopt.abbrev = revs->abbrev;
 	diff_setup_done(&revs->diffopt);