Browse Source

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>
maint
Junio C Hamano 15 years ago
parent
commit
382f013bc4
  1. 2
      diff.c
  2. 4
      diffcore-pickaxe.c
  3. 2
      diffcore.h

2
diff.c

@ -4166,7 +4166,7 @@ void diffcore_std(struct diff_options *options) @@ -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)

4
diffcore-pickaxe.c

@ -48,8 +48,10 @@ static unsigned int contains(struct diff_filespec *one, @@ -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;

2
diffcore.h

@ -107,7 +107,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *); @@ -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

Loading…
Cancel
Save