Browse Source

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>
maint
Johannes Schindelin 19 years ago committed by Junio C Hamano
parent
commit
c1f3089e4b
  1. 2
      merge-recursive.c

2
merge-recursive.c

@ -43,6 +43,8 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment @@ -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;
}


Loading…
Cancel
Save