mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2010-08-31 13:44:39 -07:00
parent a2c2cef0cd
commit 382f013bc4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -4166,7 +4166,7 @@ void diffcore_std(struct diff_options *options)
diffcore_merge_broken(); diffcore_merge_broken();
} }
if (options->pickaxe) if (options->pickaxe)
diffcore_pickaxe(options->pickaxe, options->pickaxe_opts); diffcore_pickaxe(options);
if (options->orderfile) if (options->orderfile)
diffcore_order(options->orderfile); diffcore_order(options->orderfile);
if (!options->found_follow) if (!options->found_follow)

4
diffcore-pickaxe.c
View File

@ -48,8 +48,10 @@ static unsigned int contains(struct diff_filespec *one,
return cnt; 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; struct diff_queue_struct *q = &diff_queued_diff;
unsigned long len = strlen(needle); unsigned long len = strlen(needle);
int i, has_changes; int i, has_changes;

2
diffcore.h
View File

@ -107,7 +107,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
extern void diffcore_break(int); extern void diffcore_break(int);
extern void diffcore_rename(struct diff_options *); extern void diffcore_rename(struct diff_options *);
extern void diffcore_merge_broken(void); 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); extern void diffcore_order(const char *orderfile);
#define DIFF_DEBUG 0 #define DIFF_DEBUG 0