ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()

diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh
index 9d92d3c1a27d08f15ffa2510b5017e32aecfce94..d314599428129d5759e3df5e991e5a1bb90960db 100755 (executable)
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t3033-merge-toplevel.sh
@@ -19,6 +19,8 @@ test_expect_success setup '
        test_commit three &&
        git checkout right &&
        test_commit four &&
+       git checkout --orphan newroot &&
+       test_commit five &&
        git checkout master
 '
 
@@ -77,7 +79,7 @@ test_expect_success 'merge octopus, non-fast-forward' '
 
 # The same set with FETCH_HEAD
 
-test_expect_failure 'merge FETCH_HEAD octopus into void' '
+test_expect_success 'merge FETCH_HEAD octopus into void' '
        t3033_reset &&
        git checkout --orphan test &&
        git rm -fr . &&
@@ -88,7 +90,7 @@ test_expect_failure 'merge FETCH_HEAD octopus into void' '
        test_must_fail git rev-parse HEAD
 '
 
-test_expect_failure 'merge FETCH_HEAD octopus fast-forward (ff)' '
+test_expect_success 'merge FETCH_HEAD octopus fast-forward (ff)' '
        t3033_reset &&
        git reset --hard one &&
        git fetch . left right &&
@@ -100,7 +102,7 @@ test_expect_failure 'merge FETCH_HEAD octopus fast-forward (ff)' '
        test_cmp expect actual
 '
 
-test_expect_failure 'merge FETCH_HEAD octopus non-fast-forward (ff)' '
+test_expect_success 'merge FETCH_HEAD octopus non-fast-forward (ff)' '
        t3033_reset &&
        git reset --hard one &&
        git fetch . left right &&
@@ -112,7 +114,7 @@ test_expect_failure 'merge FETCH_HEAD octopus non-fast-forward (ff)' '
        test_cmp expect actual
 '
 
-test_expect_failure 'merge FETCH_HEAD octopus fast-forward (does not ff)' '
+test_expect_success 'merge FETCH_HEAD octopus fast-forward (does not ff)' '
        t3033_reset &&
        git fetch . left right &&
        git merge FETCH_HEAD &&
@@ -123,7 +125,7 @@ test_expect_failure 'merge FETCH_HEAD octopus fast-forward (does not ff)' '
        test_cmp expect actual
 '
 
-test_expect_failure 'merge FETCH_HEAD octopus non-fast-forward' '
+test_expect_success 'merge FETCH_HEAD octopus non-fast-forward' '
        t3033_reset &&
        git fetch . left right &&
        git merge --no-ff FETCH_HEAD &&
@@ -133,4 +135,18 @@ test_expect_failure 'merge FETCH_HEAD octopus non-fast-forward' '
        test_cmp expect actual
 '
 
+# two-project merge
+test_expect_success 'refuse two-project merge by default' '
+       t3033_reset &&
+       git reset --hard four &&
+       test_must_fail git merge five
+'
+
+test_expect_success 'two-project merge with --allow-unrelated-histories' '
+       t3033_reset &&
+       git reset --hard four &&
+       git merge --allow-unrelated-histories five &&
+       git diff --exit-code five
+'
+
 test_done