help_unknown_ref(): check for refname ambiguity

[thirdparty/git.git] / t / t7600-merge.sh

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 592850cef7a106e2f0df8b9902e4549c6561bb10..36b2c8c91ffdf57d192281857a075e12b5eb801f 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -836,4 +836,10 @@ test_expect_success 'merge suggests matching remote refname' '
        grep origin/not-local stderr
 '
 
+test_expect_success 'suggested names are not ambiguous' '
+       git update-ref refs/heads/origin/not-local HEAD &&
+       test_must_fail git merge not-local 2>stderr &&
+       grep remotes/origin/not-local stderr
+'
+
 test_done