]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 696ee23) | patch
merge-recursive: get rid of virtual_id
authorMiklos Vajna <vmiklos@frugalware.org>
Fri, 5 Sep 2008 17:26:42 +0000 (19:26 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Sep 2008 18:57:54 +0000 (11:57 -0700)
commita6f63ae002237c2eb416d4e2cb43227522e4ea9a
tree349b6bc498a17414840555ff8e4713c7fe347407tree | snapshot
parent696ee23cc1817a5064780600374589d3a773a081commit | diff
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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.