Fix DIFF_QUEUE_CLEAR refactoring

It introduced a macro to reduce repeated assignments to three fields,
but an unrelated and incorrect change snuck in by mistake, which broke
commands like "git diff-files -p --submodule".

Noticed by Sven Verdoolaege.

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

diff --git a/diff.c b/diff.c
index 4a350e365e5f4d0c61977546e620bf6b79679dd5..882a9603bcd32a014b85996030e129b0acbffd93 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2540,7 +2540,6 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
 void diff_setup(struct diff_options *options)
 {
        memset(options, 0, sizeof(*options));
 void diff_setup(struct diff_options *options)
 {
        memset(options, 0, sizeof(*options));

-       memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));

 
        options->file = stdout;
 
 
        options->file = stdout;