summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorAntoine Pelisse <apelisse@gmail.com>2013-04-06 19:04:31 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-07 00:40:23 -0700
commitc4458ecdc565fb63cc3247bd1e2d7525d9d6d2fa (patch)
tree341d6c53ec6faaa764d902455eaf7420837dbf6d /object.c
parent6ff8d4e7487c0f48e568b7fd95fa02515a426c1a (diff)
downloadgit-c4458ecdc565fb63cc3247bd1e2d7525d9d6d2fa.tar.gz
fast-export: Allow pruned-references in mark file
fast-export can fail because of some pruned-reference when importing a mark file. The problem happens in the following scenario: $ git fast-export --export-marks=MARKS master (rewrite master) $ git prune $ git fast-export --import-marks=MARKS master This might fail if some references have been removed by prune because some marks will refer to no longer existing commits. git-fast-export will not need these objects anyway as they were no longer reachable. We still need to update last_numid so we don't change the mapping between marks and objects for remote-helpers. Unfortunately, the mark file should not be rewritten without lost marks if no new objects has been exported, as we could lose track of the last last_numid. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions