Add ignored test for resolved merge conflict

Author: cruessler

gix-blame/tests/blame.rs

@@ -235,6 +235,37 @@ mktest!(added_line_before_changed_line, "added-line-before-changed-line", 3);
 mktest!(same_line_changed_twice, "same-line-changed-twice", 2);
 mktest!(coalesce_adjacent_hunks, "coalesce-adjacent-hunks", 1);
 
+#[test]
+#[ignore = "TODO: as of October 2024, passing blames to more than one parent is not fully implemented yet"]
+fn merge_commits() {
+    for case in ["resolved-conflict"] {
+        let Fixture {
+            worktree_path,
+            odb,
+            mut resource_cache,
+            suspect,
+            commits,
+        } = Fixture::new().unwrap();
+
+        let lines_blamed = blame_file(
+            &odb,
+            commits,
+            &mut resource_cache,
+            suspect,
+            worktree_path,
+            format!("{case}.txt").as_str().into(),
+        )
+        .unwrap();
+
+        assert_ne!(lines_blamed.len(), 0);
+
+        let git_dir = fixture_path().join(".git");
+        let baseline = Baseline::collect(git_dir.join(format!("{case}.baseline"))).unwrap();
+
+        assert_eq!(lines_blamed, baseline, "{case}");
+    }
+}
+
 #[test]
 #[ignore = "TBD: figure out what the problem is"]
 // As of 2024-09-24, these tests are expected to fail.

gix-blame/tests/fixtures/make_blame_repo.sh

@@ -128,6 +128,32 @@ cp empty-lines-histogram.txt empty-lines-myers.txt
 git add empty-lines-histogram.txt empty-lines-myers.txt
 git commit -q -m c5.4
 
+# The commit history created by the commits above this line is linear, it only
+# contains commits that have exactly one parent.
+# Below this line, there’s also commits that have more than one parent.
+
+echo -e "line 1 original\nline 2\n line 3" > resolved-conflict.txt
+git add resolved-conflict.txt
+git commit -q -m c6
+
+echo -e "line 1 changed\nline 2\n line 3" > resolved-conflict.txt
+git add resolved-conflict.txt
+git commit -q -m c7
+
+git checkout -b different-branch-to-create-a-conflict
+git reset --hard HEAD~1
+
+echo -e "line 1 changed in a different way\nline 2\n line 3" > resolved-conflict.txt
+git add resolved-conflict.txt
+git commit -q -m c8
+
+git checkout main
+git merge different-branch-to-create-a-conflict || true
+
+echo -e "line 1 conflict resolved\nline 2\n line 3" > resolved-conflict.txt
+git add resolved-conflict.txt
+git commit -q -m c9
+
 git blame --porcelain simple.txt > .git/simple.baseline
 git blame --porcelain multiline-hunks.txt > .git/multiline-hunks.baseline
 git blame --porcelain deleted-lines.txt > .git/deleted-lines.baseline
@@ -141,6 +167,8 @@ git blame --porcelain added-line-before-changed-line.txt > .git/added-line-befor
 git blame --porcelain same-line-changed-twice.txt > .git/same-line-changed-twice.baseline
 git blame --porcelain coalesce-adjacent-hunks.txt > .git/coalesce-adjacent-hunks.baseline
 
+git blame --porcelain resolved-conflict.txt > .git/resolved-conflict.baseline
+
 git blame --porcelain empty-lines-histogram.txt > .git/empty-lines-histogram.baseline
 
 git config --local diff.algorithm myers