Merge branch 'mh/remove-subtree-long-pathname-fix' into maint

diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 7cc0a3582ef1bb1598bc5dfc5334bfbe006c3f5a..87bdf9c96bfacf4ac921ad9b195db46d9c3b079a 100755 (executable)
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -47,4 +47,10 @@ test_expect_success 'disambiguate checking out from a tree-ish' '
        git diff --exit-code --quiet
 '
 
+test_expect_success 'accurate error message with more than one ref' '
+       test_must_fail git checkout HEAD master -- 2>actual &&
+       grep 2 actual &&
+       test_i18ngrep "one reference expected, 2 given" actual
+'
+
 test_done