diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-09-05 19:26:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-09-05 11:57:54 -0700 |
| commit | a6f63ae002237c2eb416d4e2cb43227522e4ea9a (patch) | |
| tree | 349b6bc498a17414840555ff8e4713c7fe347407 | |
| parent | merge-recursive: move current_{file,directory}_set to struct merge_options (diff) | |
| download | tgif-a6f63ae002237c2eb416d4e2cb43227522e4ea9a.tar.xz | |
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>
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 1c24c31e5b..dbdb9ac2c4 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; |