undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recur: virtual commits shall never be parsed

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2006-07-31 12:42:35 +02:00 committed by Junio C Hamano
parent 7a85b848ad
commit c1f3089e4b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -43,6 +43,8 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment
commit->tree = tree; commit->tree = tree;
commit->util = (void*)comment; commit->util = (void*)comment;
*(int*)commit->object.sha1 = virtual_id++; *(int*)commit->object.sha1 = virtual_id++;
/* avoid warnings */
commit->object.parsed = 1;
return commit; return commit;
} }