From: Junio C Hamano Date: Tue, 15 Feb 2011 18:43:45 +0000 (-0800) Subject: Rename t2019 with typo "amiguous" that meant "ambiguous" X-Git-Tag: v1.7.5-rc0~117^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6c74ce8c7db669f896a04a2743c09abaa6053173;p=git.git Rename t2019 with typo "amiguous" that meant "ambiguous" Signed-off-by: Junio C Hamano --- diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh new file mode 100755 index 000000000..943541d40 --- /dev/null +++ b/t/t2019-checkout-ambiguous-ref.sh @@ -0,0 +1,59 @@ +#!/bin/sh + +test_description='checkout handling of ambiguous (branch/tag) refs' +. ./test-lib.sh + +test_expect_success 'setup ambiguous refs' ' + test_commit branch file && + git branch ambiguity && + git branch vagueness && + test_commit tag file && + git tag ambiguity && + git tag vagueness HEAD:file && + test_commit other file +' + +test_expect_success 'checkout ambiguous ref succeeds' ' + git checkout ambiguity >stdout 2>stderr +' + +test_expect_success 'checkout produces ambiguity warning' ' + grep "warning.*ambiguous" stderr +' + +test_expect_success 'checkout chooses branch over tag' ' + echo refs/heads/ambiguity >expect && + git symbolic-ref HEAD >actual && + test_cmp expect actual && + echo branch >expect && + test_cmp expect file +' + +test_expect_success 'checkout reports switch to branch' ' + grep "Switched to branch" stderr && + ! grep "^HEAD is now at" stderr +' + +test_expect_success 'checkout vague ref succeeds' ' + git checkout vagueness >stdout 2>stderr && + test_set_prereq VAGUENESS_SUCCESS +' + +test_expect_success VAGUENESS_SUCCESS 'checkout produces ambiguity warning' ' + grep "warning.*ambiguous" stderr +' + +test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' ' + echo refs/heads/vagueness >expect && + git symbolic-ref HEAD >actual && + test_cmp expect actual && + echo branch >expect && + test_cmp expect file +' + +test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' ' + grep "Switched to branch" stderr && + ! grep "^HEAD is now at" stderr +' + +test_done diff --git a/t/t2019-checkout-amiguous-ref.sh b/t/t2019-checkout-amiguous-ref.sh deleted file mode 100755 index 943541d40..000000000 --- a/t/t2019-checkout-amiguous-ref.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -test_description='checkout handling of ambiguous (branch/tag) refs' -. ./test-lib.sh - -test_expect_success 'setup ambiguous refs' ' - test_commit branch file && - git branch ambiguity && - git branch vagueness && - test_commit tag file && - git tag ambiguity && - git tag vagueness HEAD:file && - test_commit other file -' - -test_expect_success 'checkout ambiguous ref succeeds' ' - git checkout ambiguity >stdout 2>stderr -' - -test_expect_success 'checkout produces ambiguity warning' ' - grep "warning.*ambiguous" stderr -' - -test_expect_success 'checkout chooses branch over tag' ' - echo refs/heads/ambiguity >expect && - git symbolic-ref HEAD >actual && - test_cmp expect actual && - echo branch >expect && - test_cmp expect file -' - -test_expect_success 'checkout reports switch to branch' ' - grep "Switched to branch" stderr && - ! grep "^HEAD is now at" stderr -' - -test_expect_success 'checkout vague ref succeeds' ' - git checkout vagueness >stdout 2>stderr && - test_set_prereq VAGUENESS_SUCCESS -' - -test_expect_success VAGUENESS_SUCCESS 'checkout produces ambiguity warning' ' - grep "warning.*ambiguous" stderr -' - -test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' ' - echo refs/heads/vagueness >expect && - git symbolic-ref HEAD >actual && - test_cmp expect actual && - echo branch >expect && - test_cmp expect file -' - -test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' ' - grep "Switched to branch" stderr && - ! grep "^HEAD is now at" stderr -' - -test_done