Fix DIFF_QUEUE_CLEAR refactoring

gitster · gitster · commit ee38d823f74b · 2010-08-02T08:30:02.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -2540,7 +2540,6 @@ static void run_checkdiff(struct diff_filepair p, struct diff_options o)`
`2540`	`2540`	`void diff_setup(struct diff_options *options)`
`2541`	`2541`	`{`
`2542`	`2542`	`memset(options, 0, sizeof(*options));`
`2543`		`- memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));`
`2544`	`2543`
`2545`	`2544`	`options->file = stdout;`
`2546`	`2545`