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

* sv/maint-diff-q-clear-fix:
  Fix DIFF_QUEUE_CLEAR refactoring
This commit is contained in:
Junio C Hamano 2010-08-03 15:17:34 -07:00
commit bb89e84f95

1
diff.c
View File

@ -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;