Skip to content

Commit

Permalink
Fix DIFF_QUEUE_CLEAR refactoring
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Aug 2, 2010
1 parent 9ca5df9 commit ee38d82
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit ee38d82

Please sign in to comment.