summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2019-10-03 13:27:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-04 07:33:21 +0900
commitb8f50e5b60e2654fcbf5f72b682635ee2e624923 (patch)
tree2e759859e2b482d9b2927db40232a50bed26b479 /builtin
parentfast-import: allow tags to be identified by mark labels (diff)
downloadtgif-b8f50e5b60e2654fcbf5f72b682635ee2e624923.tar.xz
fast-import: add support for new 'alias' command
fast-export and fast-import have nice --import-marks flags which allow for incremental migrations. However, if there is a mark in fast-export's file of marks without a corresponding mark in the one for fast-import, then we run the risk that fast-export tries to send new objects relative to the mark it knows which fast-import does not, causing fast-import to fail. This arises in practice when there is a filter of some sort running between the fast-export and fast-import processes which prunes some commits programmatically. Provide such a filter with the ability to alias pruned commits to their most recent non-pruned ancestor. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions