Sync with v1.7.10.1

diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index c4981ba4074074eb648878571d19a1b1e121bbe1..d6e576192fcd014ed5f570ceeab1152b93d91d1f 100755 (executable)
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -125,48 +125,48 @@ 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}${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' '
        cat >expect <<-EOF &&
-       error: No upstream branch found for ${sq}${sq}
+       error: HEAD does not point to a branch
        fatal: Needed a single revision
        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' '