Added test for the multiple author check with exclusion tags

9 files changed, 21 insertions, 1 deletions

diff --git a/tests/policies_test.rs b/tests/policies_test.rs
index 65c454d..cc2a5f3 100644
--- a/tests/policies_test.rs
+++ b/tests/policies_test.rs
@@ -261,6 +261,20 @@ fn verify_git_commits_author_merged_own_code_on_head() {
 }
 
 #[test]
+fn verify_git_commits_author_merged_own_code_on_head_with_tag() {
+    before_all();
+    let result = policies::verify_git_commits::<LiveGit, MockGpg>(
+        MockGpg,
+        &verify_commits_config(),
+        "eb5e0185546b0bb1a13feec6b9ee8b39985fea42",
+        "e5924d0748c8852d74049679b34ca4b3b0570d0d",
+        "refs/heads/master",
+    )
+    .unwrap();
+    assert!(result.is_ok());
+}
+
+#[test]
 fn verify_tagged_git_commits_override_rules() {
     before_all();
     let result = policies::verify_git_commits::<LiveGit, MockGpg>(
diff --git a/tests/test-repo.git/info/refs b/tests/test-repo.git/info/refs
index 189fc79..9220d69 100644
--- a/tests/test-repo.git/info/refs
+++ b/tests/test-repo.git/info/refs
@@ -1,6 +1,7 @@
 afe2141ef20abd098927adc66d6728821cb34f59	refs/heads/invalid-author
 eef93e7f977c125f92fc78116fc9b881e4055ae8	refs/heads/invalid-merge-with-additions
 eb5e0185546b0bb1a13feec6b9ee8b39985fea42	refs/heads/master
+e5924d0748c8852d74049679b34ca4b3b0570d0d	refs/heads/multiple-author-in-tag-trunk
 6004dfdb071c71e5e76ad55b924b576487e1c485	refs/heads/same-author
 6f00838625cd1b7dc0acc66e43fee5594f0f124c	refs/heads/tagged-branch
 d2e3bfdc923986d04e7a6368b5fdd78b1ddf84f1	refs/heads/unsigned
@@ -8,6 +9,8 @@ e9752e78505f3c9bcec15d4bef4299caf0538388	refs/heads/unsigned-buried-behind-merge
 6754e4ec9b2dec567190d5a7f0be18b1a23d632a	refs/heads/valid-automerge-commit
 26b9047d071ad631d4a7c25df8bfd5361a679938	refs/heads/valid-branch
 3eb315d10e2ad89555d7bfc78a1db1ce07bce434	refs/heads/valid-merge
+d4fd29c86219abc13b3aa4a899ef8539c8f8f7b8	refs/tags/capn-override-second-author
+d47254ba71fcb50582ed555513b19761225d1d2a	refs/tags/capn-override-second-author^{}
 234f4d3d75c4215039afd598f75976f686f22cb0	refs/tags/capn-override-test-user-1
 6f00838625cd1b7dc0acc66e43fee5594f0f124c	refs/tags/capn-override-test-user-1^{}
 d43e424f3268cf86cadfab2d5fe1bcebf6ecca93	refs/tags/capn-override-test-user-2
diff --git a/tests/test-repo.git/objects/info/commit-graph b/tests/test-repo.git/objects/info/commit-graph
index eebaa01..91f5394 100644
--- a/tests/test-repo.git/objects/info/commit-graph
+++ b/tests/test-repo.git/objects/info/commit-graph
diff --git a/tests/test-repo.git/objects/info/packs b/tests/test-repo.git/objects/info/packs
index 70d23fd..0c7c399 100644
--- a/tests/test-repo.git/objects/info/packs
+++ b/tests/test-repo.git/objects/info/packs
@@ -1,2 +1,2 @@
-P pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.pack
+P pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.pack
 
diff --git a/tests/test-repo.git/objects/pack/pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.bitmap b/tests/test-repo.git/objects/pack/pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.bitmap
deleted file mode 100644
index 3557ff3..0000000
--- a/tests/test-repo.git/objects/pack/pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.bitmap
+++ /dev/null
diff --git a/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.bitmap b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.bitmap
new file mode 100644
index 0000000..e4d677a
--- /dev/null
+++ b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.bitmap
diff --git a/tests/test-repo.git/objects/pack/pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.idx b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.idx
index 091f867..786adde 100644
--- a/tests/test-repo.git/objects/pack/pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.idx
+++ b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.idx
diff --git a/tests/test-repo.git/objects/pack/pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.pack b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.pack
index 8628939..91db953 100644
--- a/tests/test-repo.git/objects/pack/pack-aebcf0ba54a230cd332fdc63f4341ae224282b87.pack
+++ b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.pack
diff --git a/tests/test-repo.git/packed-refs b/tests/test-repo.git/packed-refs
index ab9c250..e752539 100644
--- a/tests/test-repo.git/packed-refs
+++ b/tests/test-repo.git/packed-refs
@@ -2,6 +2,7 @@
 afe2141ef20abd098927adc66d6728821cb34f59 refs/heads/invalid-author
 eef93e7f977c125f92fc78116fc9b881e4055ae8 refs/heads/invalid-merge-with-additions
 eb5e0185546b0bb1a13feec6b9ee8b39985fea42 refs/heads/master
+e5924d0748c8852d74049679b34ca4b3b0570d0d refs/heads/multiple-author-in-tag-trunk
 6004dfdb071c71e5e76ad55b924b576487e1c485 refs/heads/same-author
 6f00838625cd1b7dc0acc66e43fee5594f0f124c refs/heads/tagged-branch
 d2e3bfdc923986d04e7a6368b5fdd78b1ddf84f1 refs/heads/unsigned
@@ -9,6 +10,8 @@ e9752e78505f3c9bcec15d4bef4299caf0538388 refs/heads/unsigned-buried-behind-merge
 6754e4ec9b2dec567190d5a7f0be18b1a23d632a refs/heads/valid-automerge-commit
 26b9047d071ad631d4a7c25df8bfd5361a679938 refs/heads/valid-branch
 3eb315d10e2ad89555d7bfc78a1db1ce07bce434 refs/heads/valid-merge
+d4fd29c86219abc13b3aa4a899ef8539c8f8f7b8 refs/tags/capn-override-second-author
+^d47254ba71fcb50582ed555513b19761225d1d2a
 234f4d3d75c4215039afd598f75976f686f22cb0 refs/tags/capn-override-test-user-1
 ^6f00838625cd1b7dc0acc66e43fee5594f0f124c
 d43e424f3268cf86cadfab2d5fe1bcebf6ecca93 refs/tags/capn-override-test-user-2