Sync with v1.7.10.1

diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 8c8dfdaf9f037f370629f419af02aa7a9d75f613..d6e576192fcd014ed5f570ceeab1152b93d91d1f 100755 (executable)
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -15,10 +15,18 @@ test_expect_success 'setup' '
        test_commit 3 &&
        (cd clone &&
         test_commit 4 &&
-        git branch --track my-side origin/side)
-
+        git branch --track my-side origin/side &&
+        git branch --track local-master master &&
+        git remote add -t master master-only .. &&
+        git fetch master-only &&
+        git branch bad-upstream &&
+        git config branch.bad-upstream.remote master-only &&
+        git config branch.bad-upstream.merge refs/heads/side
+       )
 '
 
+sq="'"
+
 full_name () {
        (cd clone &&
         git rev-parse --symbolic-full-name "$@")
@@ -29,6 +37,11 @@ commit_subject () {
         git show -s --pretty=format:%s "$@")
 }
 
+error_message () {
+       (cd clone &&
+        test_must_fail git rev-parse --verify "$@")
+}
+
 test_expect_success '@{upstream} resolves to correct full name' '
        test refs/remotes/origin/master = "$(full_name @{upstream})"
 '
@@ -78,14 +91,13 @@ test_expect_success 'checkout -b new my-side@{u} forks from the same' '
 
 test_expect_success 'merge my-side@{u} records the correct name' '
 (
-       sq="'\''" &&
        cd clone || exit
        git checkout master || exit
        git branch -D new ;# can fail but is ok
        git branch -t new my-side@{u} &&
        git merge -s ours new@{u} &&
        git show -s --pretty=format:%s >actual &&
-       echo "Merge remote branch ${sq}origin/side${sq}" >expect &&
+       echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect &&
        test_cmp expect actual
 )
 '
@@ -107,6 +119,69 @@ test_expect_success 'checkout other@{u}' '
        test_cmp expect actual
 '
 
+test_expect_success 'branch@{u} works when tracking a local branch' '
+       test refs/heads/master = "$(full_name local-master@{u})"
+'
+
+test_expect_success 'branch@{u} error message when no upstream' '
+       cat >expect <<-EOF &&
+       error: No upstream configured for branch ${sq}non-tracking${sq}
+       fatal: Needed a single revision
+       EOF
+       error_message non-tracking@{u} 2>actual &&
+       test_i18ncmp expect actual
+'
+
+test_expect_success '@{u} error message when no upstream' '
+       cat >expect <<-EOF &&
+       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_i18ncmp expect actual
+'
+
+test_expect_success 'branch@{u} error message with misspelt branch' '
+       cat >expect <<-EOF &&
+       error: No such branch: ${sq}no-such-branch${sq}
+       fatal: Needed a single revision
+       EOF
+       error_message no-such-branch@{u} 2>actual &&
+       test_i18ncmp expect actual
+'
+
+test_expect_success '@{u} error message when not on a branch' '
+       cat >expect <<-EOF &&
+       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_i18ncmp expect actual
+'
+
+test_expect_success 'branch@{u} error message if upstream branch not fetched' '
+       cat >expect <<-EOF &&
+       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_i18ncmp expect actual
+'
+
+test_expect_success 'pull works when tracking a local branch' '
+(
+       cd clone &&
+       git checkout local-master &&
+       git pull
+)
+'
+
+# makes sense if the previous one succeeded
+test_expect_success '@{u} works when tracking a local branch' '
+       test refs/heads/master = "$(full_name @{u})"
+'
+
 cat >expect <<EOF
 commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
 Reflog: master@{0} (C O Mitter <committer@example.com>)