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:
commit
bb89e84f95
1
diff.c
1
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)
|
void diff_setup(struct diff_options *options)
|
||||||
{
|
{
|
||||||
memset(options, 0, sizeof(*options));
|
memset(options, 0, sizeof(*options));
|
||||||
memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));
|
|
||||||
|
|
||||||
options->file = stdout;
|
options->file = stdout;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user