aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-02 08:29:42 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-02 08:30:02 -0700
commitee38d823f74bd8872c1e793f98a5b5523ee04646 (patch)
treedcd31c87f2f3754329416a216ce7a1714f861b9a
parent9ca5df90615aa3c6b60e1bc8f03db6cae98e816c (diff)
downloadgit-ee38d823f74bd8872c1e793f98a5b5523ee04646.tar.gz
git-ee38d823f74bd8872c1e793f98a5b5523ee04646.tar.xz
Fix DIFF_QUEUE_CLEAR refactoring
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>
-rw-r--r--diff.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 4a350e365..882a9603b 100644
--- 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;