Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recur: virtual commits shall never be parsed
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 10bce705fa6a637dda75753504c699dc18da7b90..74a329faa5f35c24bcd61271d635dca26778c19e 100644
(file)
--- 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;
}