| commit | a6f63ae002237c2eb416d4e2cb43227522e4ea9a | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Fri, 5 Sep 2008 17:26:42 +0000 (5 19:26 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Sep 2008 18:57:54 +0000 (5 11:57 -0700) | ||
| tree | 349b6bc498a17414840555ff8e4713c7fe347407 | treesnapshot (tar.gz zip) |
| parent | 696ee23cc1817a5064780600374589d3a773a081 | commitdiff |
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>
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 | diffblobblamehistory |