gitweb: Use @diff_opts while using format-patch

pksunkara · gitster · commit 04794fdc2701 · 2010-05-18T21:45:04.000-07:00
Make git-format-patch (used by 'patch' and 'patches' views) use the
same rename detection options that git-diff and git-diff-tree (used
by 'commitdiff', 'blobdiff', etc.) use.

Signed-off-by: Pavan Kumar Sunkara &lt;pavan.sss1991@gmail.com&gt;
Acked-by: Jakub Narebski &lt;jnareb@gmail.com&gt;
Acked-by: Giuseppe Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -6117,8 +6117,8 @@ sub git_commitdiff {
 			}
 			push @commit_spec, '--root', $hash;
 		}
-		open $fd, "-|", git_cmd(), "format-patch", '--encoding=utf8',
-			'--stdout', @commit_spec
+		open $fd, "-|", git_cmd(), "format-patch", @diff_opts,
+			'--encoding=utf8', '--stdout', @commit_spec
 			or die_error(500, "Open git-format-patch failed");
 	} else {
 		die_error(400, "Unknown commitdiff format");

Original file line number	Diff line number	Diff line change
`@@ -6117,8 +6117,8 @@ sub git_commitdiff {`
`6117`	`6117`	`}`
`6118`	`6118`	`push @commit_spec, '--root', $hash;`
`6119`	`6119`	`}`
`6120`		`- open $fd, "-\|", git_cmd(), "format-patch", '--encoding=utf8',`
`6121`		`- '--stdout', @commit_spec`
	`6120`	`+ open $fd, "-\|", git_cmd(), "format-patch", @diff_opts,`
	`6121`	`+ '--encoding=utf8', '--stdout', @commit_spec`
`6122`	`6122`	`or die_error(500, "Open git-format-patch failed");`
`6123`	`6123`	`} else {`
`6124`	`6124`	`die_error(400, "Unknown commitdiff format");`