From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Mon, 31 Jul 2006 10:42:35 +0000 (+0200)
Subject: merge-recur: virtual commits shall never be parsed
X-Git-Tag: v1.4.3-rc1~174^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246?hp=7a85b848ad77c72c539c5887ead99a89140541da

merge-recur: virtual commits shall never be parsed

It would not make sense to parse a virtual commit, therefore set the
"parsed" flag to 1.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 10bce705fa..74a329faa5 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -43,6 +43,8 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment
 	commit->tree = tree;
 	commit->util = (void*)comment;
 	*(int*)commit->object.sha1 = virtual_id++;
+	/* avoid warnings */
+	commit->object.parsed = 1;
 	return commit;
 }