summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-31 10:42:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-31 22:41:12 (GMT)
commitc1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246 (patch)
tree1e328dc91018d6d3a729728be8925b1b037524eb /merge-recursive.c
parent7a85b848ad77c72c539c5887ead99a89140541da (diff)
downloadgit-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.zip
git-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.tar.gz
git-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.tar.bz2
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 10bce70..74a329f 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;
}