summaryrefslogtreecommitdiff
path: root/builtin-archive.c
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-05-24 00:32:31 -0400
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-05-24 00:50:19 -0400
commitaac65ed1bc63619d32516079995f5cbe4bb46492 (patch)
tree47ca2263c1c34a67e7ea0a9f5751272ae41c2832 /builtin-archive.c
parentRefactor fast-import branch creation from existing commit (diff)
downloadtgif-aac65ed1bc63619d32516079995f5cbe4bb46492.tar.xz
Fix possible coredump with fast-import --import-marks
When e8438420bb7d368bec3647b90c557b9931582267 allowed us to reload the marks table on subsequent runs of fast-import we really broke things, as we set pack_id to MAX_PACK_ID for any objects we imported into the marks table. Creating a branch from that mark should fail as we attempt to read the object through a non-existant packed_git pointer. Instead we have to use the normal Git object system to locate the older commit, as we ourselves do not have a reference to the packed_git it resides in. This bug only occurred because t9300 was not complete enough. When we added the --import-marks feature we didn't actually test its implementation enough to verify the function worked as intended. I have corrected that, and included the changes as part of this fix. Prior versions of fast-import fail the new test(s); this commit allows them to pass. Credit for this bug find goes to Simon Hausmann <simon@lst.de> as he recently identified a similiar bug in the tree lazy-loading path. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'builtin-archive.c')
0 files changed, 0 insertions, 0 deletions