diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-10-20 15:25:58 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-20 14:35:58 -0700 |
| commit | b21241253bf1216bd31d24d27446895ea17b1a08 (patch) | |
| tree | 7d27fb77583fc7abadfa620ba6db686a0e742783 /.gitattributes | |
| parent | t9300 (fast-import): another test for the "replace root" feature (diff) | |
| download | tgif-b21241253bf1216bd31d24d27446895ea17b1a08.tar.xz | |
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>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions