mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ma/fast-export-skip-merge-fix'

Browse Source 
"git fast-export" had a regression in v2.15.0 era where it skipped
some merge commits in certain cases, which has been corrected.

* ma/fast-export-skip-merge-fix:
  fast-export: fix regression skipping some merge-commits
This commit is contained in:
Junio C Hamano
2018-05-08 15:59:33 +09:00
parent df7abe3fef be011bbe00
commit ad3207e6ff
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/fast-export.c
View File

@ -651,8 +651,11 @@ static void handle_tail(struct object_array *commits, struct rev_info *revs,
struct commit *commit; struct commit *commit;
while (commits->nr) { while (commits->nr) {
commit = (struct commit *)object_array_pop(commits); 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; return;
}
handle_commit(commit, revs, paths_of_changed_objects); handle_commit(commit, revs, paths_of_changed_objects);
} }
} }

18
t/t9350-fast-export.sh
View File

@ -538,4 +538,22 @@ test_expect_success 'when using -C, do not declare copy when source of copy is a
test_cmp expected actual 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 test_done