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

diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh
index 3900d9f61f84a9eab907e87fca7bb9429ea36f04..3e692454a719324a7ed3c12238416f45df080efa 100755 (executable)
--- a/t/t6029-merge-subtree.sh
+++ b/t/t6029-merge-subtree.sh
@@ -6,7 +6,7 @@ test_description='subtree merge strategy'
 
 test_expect_success setup '
 
-       s="1 2 3 4 5 6 7 8"
+       s="1 2 3 4 5 6 7 8" &&
        for i in $s; do echo $i; done >hello &&
        git add hello &&
        git commit -m initial &&
@@ -49,7 +49,7 @@ test_expect_success 'setup' '
 
 test_expect_success 'initial merge' '
        git remote add -f gui ../git-gui &&
-       git merge -s ours --no-commit gui/master &&
+       git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
        git read-tree --prefix=git-gui/ -u gui/master &&
        git commit -m "Merge git-gui as our subdirectory" &&
        git checkout -b work &&