diff: pass the whole diff_options to diffcore_apply_filter()

The --diff-filter=<arg> option given by the user is kept as a
string, and passed to the underlying diffcore_apply_filter()
function as a string for each resulting path we run number of
strchr() to see if each class of change among ACDMRTXUB is meant to
be given.

Change the function signature to pass the whole diff_options, so
that we can pre-parse this string in the next patch.

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

diff --git a/diff.c b/diff.c
index 649ec86b87c4eb201f9e587a0173e381e9b5b8b5..41c64f2b28176f1c3a48e421e779931c7cb51fc2 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4509,11 +4509,13 @@ void diff_flush(struct diff_options *options)
        }
 }
 
        }
 }
 

-static void diffcore_apply_filter(const char *filter)
+static void diffcore_apply_filter(struct diff_options *options)

 {
        int i;
        struct diff_queue_struct *q = &diff_queued_diff;
        struct diff_queue_struct outq;
 {
        int i;
        struct diff_queue_struct *q = &diff_queued_diff;
        struct diff_queue_struct outq;

+       const char *filter = options->filter;
+

        DIFF_QUEUE_CLEAR(&outq);
 
        if (!filter)
        DIFF_QUEUE_CLEAR(&outq);
 
        if (!filter)


@@ -4661,7 +4663,7 @@ void diffcore_std(struct diff_options *options)
        if (!options->found_follow)
                /* See try_to_follow_renames() in tree-diff.c */
                diff_resolve_rename_copy();
        if (!options->found_follow)
                /* See try_to_follow_renames() in tree-diff.c */
                diff_resolve_rename_copy();

-       diffcore_apply_filter(options->filter);
+       diffcore_apply_filter(options);

 
        if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
                DIFF_OPT_SET(options, HAS_CHANGES);
 
        if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
                DIFF_OPT_SET(options, HAS_CHANGES);