git-receiver: allow deploying from "main" branch

if a "main" branch is available and no "master" branch is available, use
it. "master" still takes precedence to avoid breaking old setups.

1 files changed, 37 insertions, 11 deletions

diff --git a/tests/blogc-git-receiver/check_pre_receive_parser.c b/tests/blogc-git-receiver/check_pre_receive_parser.c
index 0415be1..c431821 100644
--- a/tests/blogc-git-receiver/check_pre_receive_parser.c
+++ b/tests/blogc-git-receiver/check_pre_receive_parser.c
@@ -43,18 +43,28 @@ test_pre_receive_parse(void **state)
         "4f1f932f6ef6d6c9770266775c2db072964d7a62 "
         "3fff4bb3172f77b292b0c913749e81bedd3545f3 "
         "refs/heads/master"));
-    assert_null(_bgr_pre_receive_parse(
+
+    bc_trie_t *t;
+    t = _bgr_pre_receive_parse(
         "4f1f932f6ef6d6c9770266775c2db072964d7a62 "
         "3fff4bb3172f77b292b0c913749e81bedd3545f3 "
-        "refs/heads/master asd\n"));
-    char *t;
+        "refs/heads/master asd\n");
+    assert_non_null(t);
+    assert_int_equal(bc_trie_size(t), 1);
+    assert_string_equal(bc_trie_lookup(t, "master asd"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545f3");
+    bc_trie_free(t);
+
     t = _bgr_pre_receive_parse(
         "4f1f932f6ef6d6c9770266775c2db072964d7a62 "
         "3fff4bb3172f77b292b0c913749e81bedd3545f3 "
         "refs/heads/master\n");
     assert_non_null(t);
-    assert_string_equal(t, "3fff4bb3172f77b292b0c913749e81bedd3545f3");
-    free(t);
+    assert_int_equal(bc_trie_size(t), 1);
+    assert_string_equal(bc_trie_lookup(t, "master"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545f3");
+    bc_trie_free(t);
+
     t = _bgr_pre_receive_parse(
         "4f1f932f6ef6d6c9770266775c2db072964d7a62 "
         "3fff4bb3172f77b292b0c913749e81bedd3545fa "
@@ -64,8 +74,13 @@ test_pre_receive_parse(void **state)
         "refs/heads/bola\n"
     );
     assert_non_null(t);
-    assert_string_equal(t, "3fff4bb3172f77b292b0c913749e81bedd3545fa");
-    free(t);
+    assert_int_equal(bc_trie_size(t), 2);
+    assert_string_equal(bc_trie_lookup(t, "master"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545fa");
+    assert_string_equal(bc_trie_lookup(t, "bola"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545f4");
+    bc_trie_free(t);
+
     t = _bgr_pre_receive_parse(
         "4f1f932f6ef6d6c9770266775c2db072964d7a63 "
         "3fff4bb3172f77b292b0c913749e81bedd3545f4 "
@@ -75,8 +90,13 @@ test_pre_receive_parse(void **state)
         "refs/heads/master\n"
     );
     assert_non_null(t);
-    assert_string_equal(t, "3fff4bb3172f77b292b0c913749e81bedd3545fb");
-    free(t);
+    assert_int_equal(bc_trie_size(t), 2);
+    assert_string_equal(bc_trie_lookup(t, "bola"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545f4");
+    assert_string_equal(bc_trie_lookup(t, "master"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545fb");
+    bc_trie_free(t);
+
     t = _bgr_pre_receive_parse(
         "4f1f932f6ef6d6c9770266775c2db072964d7a63 "
         "3fff4bb3172f77b292b0c913749e81bedd3545f4 "
@@ -89,8 +109,14 @@ test_pre_receive_parse(void **state)
         "refs/heads/bolao\n"
     );
     assert_non_null(t);
-    assert_string_equal(t, "3fff4bb3172f77b292b0c913749e81bedd3545fc");
-    free(t);
+    assert_int_equal(bc_trie_size(t), 3);
+    assert_string_equal(bc_trie_lookup(t, "bola"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545f4");
+    assert_string_equal(bc_trie_lookup(t, "master"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545fc");
+    assert_string_equal(bc_trie_lookup(t, "bolao"),
+        "3fff4bb3172f77b292b0c913749e81bedd3545f5");
+    bc_trie_free(t);
 }