diff: pass the entire diff-options to diffcore_pickaxe()

gitster · gitster · commit 382f013bc404 · 2010-08-31T14:30:28.000-07:00
That would make it easier to give enhanced feature to the
pickaxe transformation.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff.c b/diff.c
@@ -4166,7 +4166,7 @@ void diffcore_std(struct diff_options *options)
 			diffcore_merge_broken();
 	}
 	if (options->pickaxe)
-		diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
+		diffcore_pickaxe(options);
 	if (options->orderfile)
 		diffcore_order(options->orderfile);
 	if (!options->found_follow)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
@@ -48,8 +48,10 @@ static unsigned int contains(struct diff_filespec *one,
 	return cnt;
 }
 
-void diffcore_pickaxe(const char *needle, int opts)
+void diffcore_pickaxe(struct diff_options *o)
 {
+	const char *needle = o->pickaxe;
+	int opts = o->pickaxe_opts;
 	struct diff_queue_struct *q = &diff_queued_diff;
 	unsigned long len = strlen(needle);
 	int i, has_changes;
diff --git a/diffcore.h b/diffcore.h
@@ -107,7 +107,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
 extern void diffcore_break(int);
 extern void diffcore_rename(struct diff_options *);
 extern void diffcore_merge_broken(void);
-extern void diffcore_pickaxe(const char *needle, int opts);
+extern void diffcore_pickaxe(struct diff_options *);
 extern void diffcore_order(const char *orderfile);
 
 #define DIFF_DEBUG 0

Original file line number	Diff line number	Diff line change
`@@ -4166,7 +4166,7 @@ void diffcore_std(struct diff_options *options)`
`4166`	`4166`	`diffcore_merge_broken();`
`4167`	`4167`	`}`
`4168`	`4168`	`if (options->pickaxe)`
`4169`		`- diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);`
	`4169`	`+ diffcore_pickaxe(options);`
`4170`	`4170`	`if (options->orderfile)`
`4171`	`4171`	`diffcore_order(options->orderfile);`
`4172`	`4172`	`if (!options->found_follow)`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,10 @@ static unsigned int contains(struct diff_filespec *one,`
`48`	`48`	`return cnt;`
`49`	`49`	`}`
`50`	`50`
`51`		`-void diffcore_pickaxe(const char *needle, int opts)`
	`51`	`+void diffcore_pickaxe(struct diff_options *o)`
`52`	`52`	`{`
	`53`	`+ const char *needle = o->pickaxe;`
	`54`	`+ int opts = o->pickaxe_opts;`
`53`	`55`	`struct diff_queue_struct *q = &diff_queued_diff;`
`54`	`56`	`unsigned long len = strlen(needle);`
`55`	`57`	`int i, has_changes;`