Merge branch 'jk/submodule-fsck-loose' into maint

diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 46ef1f22dca14423ecff8da45d608a8885f23dba..2ce68cc277a1ed742ce7b644de31a4a847e3529b 100755 (executable)
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -42,15 +42,18 @@ commit_subject () {
 
 error_message () {
        (cd clone &&
-        test_must_fail git rev-parse --verify "$@")
+        test_must_fail git rev-parse --verify "$@" 2>../error)
 }
 
 test_expect_success '@{upstream} resolves to correct full name' '
-       test refs/remotes/origin/master = "$(full_name @{upstream})"
+       test refs/remotes/origin/master = "$(full_name @{upstream})" &&
+       test refs/remotes/origin/master = "$(full_name @{UPSTREAM})" &&
+       test refs/remotes/origin/master = "$(full_name @{UpSTReam})"
 '
 
 test_expect_success '@{u} resolves to correct full name' '
-       test refs/remotes/origin/master = "$(full_name @{u})"
+       test refs/remotes/origin/master = "$(full_name @{u})" &&
+       test refs/remotes/origin/master = "$(full_name @{U})"
 '
 
 test_expect_success 'my-side@{upstream} resolves to correct full name' '
@@ -60,6 +63,8 @@ test_expect_success 'my-side@{upstream} resolves to correct full name' '
 test_expect_success 'upstream of branch with @ in middle' '
        full_name fun@ny@{u} >actual &&
        echo refs/remotes/origin/side >expect &&
+       test_cmp expect actual &&
+       full_name fun@ny@{U} >actual &&
        test_cmp expect actual
 '
 
@@ -96,12 +101,14 @@ test_expect_success 'not-tracking@{u} fails' '
 test_expect_success '<branch>@{u}@{1} resolves correctly' '
        test_commit 6 &&
        (cd clone && git fetch) &&
-       test 5 = $(commit_subject my-side@{u}@{1})
+       test 5 = $(commit_subject my-side@{u}@{1}) &&
+       test 5 = $(commit_subject my-side@{U}@{1})
 '
 
 test_expect_success '@{u} without specifying branch fails on a detached HEAD' '
        git checkout HEAD^0 &&
-       test_must_fail git rev-parse @{u}
+       test_must_fail git rev-parse @{u} &&
+       test_must_fail git rev-parse @{U}
 '
 
 test_expect_success 'checkout -b new my-side@{u} forks from the same' '
@@ -152,8 +159,8 @@ test_expect_success 'branch@{u} error message when no upstream' '
        cat >expect <<-EOF &&
        fatal: no upstream configured for branch ${sq}non-tracking${sq}
        EOF
-       error_message non-tracking@{u} 2>actual &&
-       test_i18ncmp expect actual
+       error_message non-tracking@{u} &&
+       test_i18ncmp expect error
 '
 
 test_expect_success '@{u} error message when no upstream' '
@@ -168,8 +175,8 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
        cat >expect <<-EOF &&
        fatal: no such branch: ${sq}no-such-branch${sq}
        EOF
-       error_message no-such-branch@{u} 2>actual &&
-       test_i18ncmp expect actual
+       error_message no-such-branch@{u} &&
+       test_i18ncmp expect error
 '
 
 test_expect_success '@{u} error message when not on a branch' '
@@ -185,8 +192,8 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' '
        cat >expect <<-EOF &&
        fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
        EOF
-       error_message bad-upstream@{u} 2>actual &&
-       test_i18ncmp expect actual
+       error_message bad-upstream@{u} &&
+       test_i18ncmp expect error
 '
 
 test_expect_success 'pull works when tracking a local branch' '