Merge branch 'mg/work-tree-tests'

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 2797f225308fa28965bc06017a4c0b772ab97025..cf3469b142d7ab015dca14f4f9898bae784a9e9a 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1558,4 +1558,12 @@ test_expect_success '--no-merged show unmerged tags' '
        test_cmp expect actual
 '
 
+test_expect_success 'ambiguous branch/tags not marked' '
+       git tag ambiguous &&
+       git branch ambiguous &&
+       echo ambiguous >expect &&
+       git tag -l ambiguous >actual &&
+       test_cmp expect actual
+'
+
 test_done