Add new @ shortcut for HEAD

diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 2f4f0d1c02953756d58ec7ca996fd8f23ad0b6f7..b27a7209f7401706f3b0a37b495fc0cb3a07c29e 100755 (executable)
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -54,6 +54,10 @@ test_expect_success 'my-side@{upstream} resolves to correct full name' '
        test refs/remotes/origin/side = "$(full_name my-side@{u})"
 '
 
+test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}' '
+       test_must_fail full_name refs/heads/my-side@{upstream}
+'
+
 test_expect_success 'my-side@{u} resolves to correct commit' '
        git checkout side &&
        test_commit 5 &&
@@ -125,29 +129,29 @@ test_expect_success 'branch@{u} works when tracking a local branch' '
 
 test_expect_success 'branch@{u} error message when no upstream' '
        cat >expect <<-EOF &&
-       error: No upstream branch found for ${sq}non-tracking${sq}
+       error: No upstream configured for branch ${sq}non-tracking${sq}
        fatal: Needed a single revision
        EOF
        error_message non-tracking@{u} 2>actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success '@{u} error message when no upstream' '
        cat >expect <<-EOF &&
-       error: No upstream branch found for ${sq}master${sq}
+       error: No upstream configured for branch ${sq}master${sq}
        fatal: Needed a single revision
        EOF
        test_must_fail git rev-parse --verify @{u} 2>actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success 'branch@{u} error message with misspelt branch' '
        cat >expect <<-EOF &&
-       error: No upstream branch found for ${sq}no-such-branch${sq}
+       error: No such branch: ${sq}no-such-branch${sq}
        fatal: Needed a single revision
        EOF
        error_message no-such-branch@{u} 2>actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success '@{u} error message when not on a branch' '
@@ -157,16 +161,16 @@ test_expect_success '@{u} error message when not on a branch' '
        EOF
        git checkout HEAD^0 &&
        test_must_fail git rev-parse --verify @{u} 2>actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success 'branch@{u} error message if upstream branch not fetched' '
        cat >expect <<-EOF &&
-       error: No upstream branch found for ${sq}bad-upstream${sq}
+       error: Upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
        fatal: Needed a single revision
        EOF
        error_message bad-upstream@{u} 2>actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success 'pull works when tracking a local branch' '