summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f8bd36a)
raw | patch | inline | side by side (parent: f8bd36a)
author | Junio C Hamano <gitster@pobox.com> | |
Tue, 15 Feb 2011 18:43:45 +0000 (10:43 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 15 Feb 2011 18:43:45 +0000 (10:43 -0800) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2019-checkout-ambiguous-ref.sh | [new file with mode: 0755] | patch | blob |
t/t2019-checkout-amiguous-ref.sh | [deleted file] | patch | blob | history |
diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh
--- /dev/null
@@ -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
+++ /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