зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
7a85b848ad
Коммит
c1f3089e4b
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче