From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Aug 2010 15:29:42 +0000 (-0700)
Subject: Fix DIFF_QUEUE_CLEAR refactoring
X-Git-Tag: v1.7.2.2~27^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ee38d823f74bd8872c1e793f98a5b5523ee04646;p=git.git

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 4a350e365..882a9603b 100644
--- 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));
-	memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));
 
 	options->file = stdout;