merge-recursive: get rid of virtual_id

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 <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-recursive.c b/merge-recursive.c
index 1c24c31e5b96ff5d3c556b86c5422d93c2353d95..dbdb9ac2c41d700f7d8521f25a5d45aefd0829c7 100644 (file)
--- 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));
  */
 
 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;
        commit->tree = tree;
        commit->util = (void*)comment;

-       *(int*)commit->object.sha1 = virtual_id++;

        /* avoid warnings */
        commit->object.parsed = 1;
        return commit;
        /* avoid warnings */
        commit->object.parsed = 1;
        return commit;