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>
Johannes Schindelin committed
Jul 31, 2006 at 12:42 UTC
c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246
1 file changed
+2
merge-recursive.c
+2
@@ -43,6 +43,8 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment
43
commit->tree = tree;
44
commit->util = (void*)comment;
45
*(int*)commit->object.sha1 = virtual_id++;
46
+ /* avoid warnings */
47
+ commit->object.parsed = 1;
48
return commit;
49
}
50