From: Miklos Vajna Date: Fri, 05 Sep 2008 17:26:42 GMT Subject: [PATCH] merge-recursive: get rid of virtual_id Message-ID: <1220635602-13796-1-git-send-email-vmiklos@frugalware.org> In-Reply-To: <7vy7273f9v.fsf@gitster.siamese.dyndns.org> We now just leave the object->sha1 field of virtual commits 0{40} as it is initialized, as a unique hash is not necessary in case of virtual commits. Signed-off-by: Miklos Vajna --- On Thu, Sep 04, 2008 at 12:03:08PM -0700, Junio C Hamano wrote: > Does it hurt if we get rid of virtual_id and always leave the > object->sha1 field of virtual commits 0{40} as it is initialized? I don't think so. Here is a patch that does it. merge-recursive.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 1c24c31..dbdb9ac 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -35,18 +35,14 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two) } /* - * A virtual commit has - * - (const char *)commit->util set to the name, and - * - *(int *)commit->object.sha1 set to the virtual id. + * A virtual commit has (const char *)commit->util set to the name. */ struct commit *make_virtual_commit(struct tree *tree, const char *comment) { struct commit *commit = xcalloc(1, sizeof(struct commit)); - static unsigned virtual_id = 1; commit->tree = tree; commit->util = (void*)comment; - *(int*)commit->object.sha1 = virtual_id++; /* avoid warnings */ commit->object.parsed = 1; return commit; -- 1.6.0.1