Merge branch 'jc/name-rev-stdin'

[thirdparty/git.git] / t / t6120-describe.sh

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index d8af2bb9d2b876c3277d1211468ce4717b83697e..9781b92aeddfee9fbfbfba921a15edea51de50cd 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -270,7 +270,7 @@ test_expect_success 'name-rev --all' '
        test_cmp expect actual
 '
 
-test_expect_success 'name-rev --stdin' '
+test_expect_success 'name-rev --annotate-stdin' '
        >expect.unsorted &&
        for rev in $(git rev-list --all)
        do
@@ -278,11 +278,16 @@ test_expect_success 'name-rev --stdin' '
                echo "$rev ($name)" >>expect.unsorted || return 1
        done &&
        sort <expect.unsorted >expect &&
-       git rev-list --all | git name-rev --stdin >actual.unsorted &&
+       git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
        sort <actual.unsorted >actual &&
        test_cmp expect actual
 '
 
+test_expect_success 'name-rev --stdin deprecated' "
+       git rev-list --all | git name-rev --stdin 2>actual &&
+       grep -E 'warning: --stdin is deprecated' actual
+"
+
 test_expect_success 'describe --contains with the exact tags' '
        echo "A^0" >expect &&
        tag_object=$(git rev-parse refs/tags/A) &&