X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.c;h=2fa285a8efc69fac1ba922b0b7ada9230de93c79;hb=5910e997754e0a03f25457965bd9faf80f2f9854;hp=fe4664c53cbfb6cfc6c2132bced61fddc262a6ee;hpb=12d81ce59846e17676c5534257ca2f1783829d63;p=git.git

diff --git a/diff.c b/diff.c
index fe4664c5..2fa285a8 100644
--- a/diff.c
+++ b/diff.c
@@ -142,11 +142,12 @@ static void copy_file(int prefix, const char *data, int size)
 
 static void emit_rewrite_diff(const char *name_a,
 			      const char *name_b,
-			      struct diff_filespec *one, 
+			      struct diff_filespec *one,
 			      struct diff_filespec *two)
 {
-	/* Use temp[i].name as input, name_a and name_b as labels */
 	int lc_a, lc_b;
+	diff_populate_filespec(one, 0);
+	diff_populate_filespec(two, 0);
 	lc_a = count_lines(one->data, one->size);
 	lc_b = count_lines(two->data, two->size);
 	printf("--- %s\n+++ %s\n@@ -", name_a, name_b);
@@ -883,6 +884,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 		options->filter = arg + 14;
 	else if (!strcmp(arg, "--pickaxe-all"))
 		options->pickaxe_opts = DIFF_PICKAXE_ALL;
+	else if (!strcmp(arg, "--pickaxe-regex"))
+		options->pickaxe_opts = DIFF_PICKAXE_REGEX;
 	else if (!strncmp(arg, "-B", 2)) {
 		if ((options->break_opt =
 		     diff_scoreopt_parse(arg)) == -1)
@@ -1372,8 +1375,6 @@ static void diffcore_apply_filter(const char *filter)
 
 void diffcore_std(struct diff_options *options)
 {
-	if (options->paths && options->paths[0])
-		diffcore_pathspec(options->paths);
 	if (options->break_opt != -1)
 		diffcore_break(options->break_opt);
 	if (options->detect_rename)