Add test case

2025-08-13 19:30:37 +00:00 · 2015-10-30 18:32:34 +01:00 · 2015-10-30 18:32:34 +01:00 · 85196232e8
commit 85196232e8
parent 1d0bed9de1
8 changed files with 19 additions and 0 deletions
--- a/tests/resources/redundant.git/HEAD
+++ b/tests/resources/redundant.git/HEAD
--- a/tests/resources/redundant.git/config
+++ b/tests/resources/redundant.git/config
--- a/tests/resources/redundant.git/objects/info/packs
+++ b/tests/resources/redundant.git/objects/info/packs
--- a/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.idx
+++ b/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.idx
--- a/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.pack
+++ b/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.pack
--- a/tests/resources/redundant.git/packed-refs
+++ b/tests/resources/redundant.git/packed-refs
--- a/tests/resources/redundant.git/refs/.gitkeep
+++ b/tests/resources/redundant.git/refs/.gitkeep
--- a/tests/revwalk/mergebase.c
+++ b/tests/revwalk/mergebase.c
@ -492,3 +492,22 @@ void test_revwalk_mergebase__octopus_merge_branch(void)
 *
 *       a
 */
+
+void test_revwalk_mergebase__remove_redundant(void)
+{
+	git_repository *repo;
+	git_oid one, two, base;
+	git_oidarray result = {NULL, 0};
+
+	cl_git_pass(git_repository_open(&repo, cl_fixture("redundant.git")));
+
+	cl_git_pass(git_oid_fromstr(&one, "d89137c93ba1ee749214ff4ce52ae9137bc833f9"));
+	cl_git_pass(git_oid_fromstr(&two, "91f4b95df4a59504a9813ba66912562931d990e3"));
+	cl_git_pass(git_oid_fromstr(&base, "6cb1f2352d974e1c5a776093017e8772416ac97a"));
+
+	cl_git_pass(git_merge_bases(&result, repo, &one, &two));
+	cl_assert_equal_i(1, result.count);
+	cl_assert_equal_oid(&base, &result.ids[0]);
+
+	git_repository_free(repo);
+}