diff options
| -rw-r--r-- | builtin/fast-export.c | 5 | ||||
| -rwxr-xr-x | t/t9350-fast-export.sh | 18 |
2 files changed, 22 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 796d0cd66c..2fc3e76835 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -651,8 +651,11 @@ static void handle_tail(struct object_array *commits, struct rev_info *revs, struct commit *commit; while (commits->nr) { commit = (struct commit *)object_array_pop(commits); - if (has_unshown_parent(commit)) + if (has_unshown_parent(commit)) { + /* Queue again, to be handled later */ + add_object_array(&commit->object, NULL, commits); return; + } handle_commit(commit, revs, paths_of_changed_objects); } } diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index 866ddf6058..c699c88d00 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -540,4 +540,22 @@ test_expect_success 'when using -C, do not declare copy when source of copy is a test_cmp expected actual ' +test_expect_success 'merge commit gets exported with --import-marks' ' + test_create_repo merging && + ( + cd merging && + test_commit initial && + git checkout -b topic && + test_commit on-topic && + git checkout master && + test_commit on-master && + test_tick && + git merge --no-ff -m Yeah topic && + + echo ":1 $(git rev-parse HEAD^^)" >marks && + git fast-export --import-marks=marks master >out && + grep Yeah out + ) +' + test_done |