From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Aug 2010 20:44:39 +0000 (-0700)
Subject: diff: pass the entire diff-options to diffcore_pickaxe()
X-Git-Tag: v1.7.4-rc0~205^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=382f013bc40452e4c24b8698217a14ff35f6dcec;p=git.git

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

That would make it easier to give enhanced feature to the
pickaxe transformation.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index 6fb97d462..6631fa387 100644
--- 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
index 929de15aa..13f61fbb0 100644
--- 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
index 8b3241ad1..b8f1fdecf 100644
--- 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