]> git.ipfire.org Git - thirdparty/git.git/commit - fast-import.c
fast-import: add support for new 'alias' command
authorElijah Newren <newren@gmail.com>
Thu, 3 Oct 2019 20:27:05 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Oct 2019 22:33:21 +0000 (07:33 +0900)
commitb8f50e5b60e2654fcbf5f72b682635ee2e624923
tree2e759859e2b482d9b2927db40232a50bed26b479
parentf73b2aba05788208ccd9b48f350b90cbfe57e1c4
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>
Documentation/git-fast-import.txt
fast-import.c
t/t9300-fast-import.sh