| commit | b21241253bf1216bd31d24d27446895ea17b1a08 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Wed, 20 Oct 2010 20:25:58 +0000 (20 15:25 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Oct 2010 21:35:58 +0000 (20 14:35 -0700) | ||
| tree | 7d27fb77583fc7abadfa620ba6db686a0e742783 | treesnapshot (tar.gz zip) |
| parent | 971728c853f8fcdfcecd768c74010965c383c431 | commitdiff |
fast-import: do not clear notes in do_change_note_fanout()
Commit 5edde51 (fast-import: filemodify after M 040000 <tree> ""
crashes, 2010-10-17) taught fast-import to load trees from the
object db as needed when it is time to access them.
But it went too far. In change_note_fanout(), an empty,
not-loaded tree is not meant to destroy notes, so calling
load_tree() at that point is exactly the wrong thing to do.
Kudos to Johan Herland for t9301, which caught this failure.
Reported-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit 5edde51 (fast-import: filemodify after M 040000 <tree> ""
crashes, 2010-10-17) taught fast-import to load trees from the
object db as needed when it is time to access them.
But it went too far. In change_note_fanout(), an empty,
not-loaded tree is not meant to destroy notes, so calling
load_tree() at that point is exactly the wrong thing to do.
Kudos to Johan Herland for t9301, which caught this failure.
Reported-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| fast-import.c | diffblobblamehistory |