Commit 382f013b authored by Junio C Hamano's avatar Junio C Hamano

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: default avatarJunio C Hamano <>
parent a2c2cef0
......@@ -4166,7 +4166,7 @@ void diffcore_std(struct diff_options *options)
if (options->pickaxe)
diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
if (options->orderfile)
if (!options->found_follow)
......@@ -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;
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment