Merge branch 'sv/maint-diff-q-clear-fix' into maint

gitster · gitster · commit bb89e84f95a4 · 2010-08-03T15:17:34.000-07:00
* sv/maint-diff-q-clear-fix:
  Fix DIFF_QUEUE_CLEAR refactoring
diff --git a/diff.c b/diff.c
@@ -2814,7 +2814,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
`@@ -2814,7 +2814,6 @@ static void run_checkdiff(struct diff_filepair p, struct diff_options o)`
`2814`	`2814`	`void diff_setup(struct diff_options *options)`
`2815`	`2815`	`{`
`2816`	`2816`	`memset(options, 0, sizeof(*options));`
`2817`		`- memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));`
`2818`	`2817`
`2819`	`2818`	`options->file = stdout;`
`2820`	`2819`