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

gitster · gitster · commit ad3207e6ff01 · 2018-05-08T15:59:33.000+09:00
"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
diff --git 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
@@ -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_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

Original file line number	Diff line number	Diff line change
`@@ -651,8 +651,11 @@ static void handle_tail(struct object_array commits, struct rev_info revs,`
`651`	`651`	`struct commit *commit;`
`652`	`652`	`while (commits->nr) {`
`653`	`653`	`commit = (struct commit *)object_array_pop(commits);`
`654`		`- if (has_unshown_parent(commit))`
	`654`	`+ if (has_unshown_parent(commit)) {`
	`655`	`+ /* Queue again, to be handled later */`
	`656`	`+ add_object_array(&commit->object, NULL, commits);`
`655`	`657`	`return;`
	`658`	`+ }`
`656`	`659`	`handle_commit(commit, revs, paths_of_changed_objects);`
`657`	`660`	`}`
`658`	`661`	`}`