t / t1507-rev-parse-upstream.shon commit Merge branch 'jc/merge-blobs' into maint (686b895)
   1#!/bin/sh
   2
   3test_description='test <branch>@{upstream} syntax'
   4
   5. ./test-lib.sh
   6
   7
   8test_expect_success 'setup' '
   9
  10        test_commit 1 &&
  11        git checkout -b side &&
  12        test_commit 2 &&
  13        git checkout master &&
  14        git clone . clone &&
  15        test_commit 3 &&
  16        (cd clone &&
  17         test_commit 4 &&
  18         git branch --track my-side origin/side &&
  19         git branch --track local-master master &&
  20         git remote add -t master master-only .. &&
  21         git fetch master-only &&
  22         git branch bad-upstream &&
  23         git config branch.bad-upstream.remote master-only &&
  24         git config branch.bad-upstream.merge refs/heads/side
  25        )
  26'
  27
  28sq="'"
  29
  30full_name () {
  31        (cd clone &&
  32         git rev-parse --symbolic-full-name "$@")
  33}
  34
  35commit_subject () {
  36        (cd clone &&
  37         git show -s --pretty=format:%s "$@")
  38}
  39
  40error_message () {
  41        (cd clone &&
  42         test_must_fail git rev-parse --verify "$@")
  43}
  44
  45test_expect_success '@{upstream} resolves to correct full name' '
  46        test refs/remotes/origin/master = "$(full_name @{upstream})"
  47'
  48
  49test_expect_success '@{u} resolves to correct full name' '
  50        test refs/remotes/origin/master = "$(full_name @{u})"
  51'
  52
  53test_expect_success 'my-side@{upstream} resolves to correct full name' '
  54        test refs/remotes/origin/side = "$(full_name my-side@{u})"
  55'
  56
  57test_expect_success 'my-side@{u} resolves to correct commit' '
  58        git checkout side &&
  59        test_commit 5 &&
  60        (cd clone && git fetch) &&
  61        test 2 = "$(commit_subject my-side)" &&
  62        test 5 = "$(commit_subject my-side@{u})"
  63'
  64
  65test_expect_success 'not-tracking@{u} fails' '
  66        test_must_fail full_name non-tracking@{u} &&
  67        (cd clone && git checkout --no-track -b non-tracking) &&
  68        test_must_fail full_name non-tracking@{u}
  69'
  70
  71test_expect_success '<branch>@{u}@{1} resolves correctly' '
  72        test_commit 6 &&
  73        (cd clone && git fetch) &&
  74        test 5 = $(commit_subject my-side@{u}@{1})
  75'
  76
  77test_expect_success '@{u} without specifying branch fails on a detached HEAD' '
  78        git checkout HEAD^0 &&
  79        test_must_fail git rev-parse @{u}
  80'
  81
  82test_expect_success 'checkout -b new my-side@{u} forks from the same' '
  83(
  84        cd clone &&
  85        git checkout -b new my-side@{u} &&
  86        git rev-parse --symbolic-full-name my-side@{u} >expect &&
  87        git rev-parse --symbolic-full-name new@{u} >actual &&
  88        test_cmp expect actual
  89)
  90'
  91
  92test_expect_success 'merge my-side@{u} records the correct name' '
  93(
  94        cd clone || exit
  95        git checkout master || exit
  96        git branch -D new ;# can fail but is ok
  97        git branch -t new my-side@{u} &&
  98        git merge -s ours new@{u} &&
  99        git show -s --pretty=format:%s >actual &&
 100        echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect &&
 101        test_cmp expect actual
 102)
 103'
 104
 105test_expect_success 'branch -d other@{u}' '
 106        git checkout -t -b other master &&
 107        git branch -d @{u} &&
 108        git for-each-ref refs/heads/master >actual &&
 109        >expect &&
 110        test_cmp expect actual
 111'
 112
 113test_expect_success 'checkout other@{u}' '
 114        git branch -f master HEAD &&
 115        git checkout -t -b another master &&
 116        git checkout @{u} &&
 117        git symbolic-ref HEAD >actual &&
 118        echo refs/heads/master >expect &&
 119        test_cmp expect actual
 120'
 121
 122test_expect_success 'branch@{u} works when tracking a local branch' '
 123        test refs/heads/master = "$(full_name local-master@{u})"
 124'
 125
 126test_expect_success 'branch@{u} error message when no upstream' '
 127        cat >expect <<-EOF &&
 128        error: No upstream configured for branch ${sq}non-tracking${sq}
 129        fatal: Needed a single revision
 130        EOF
 131        error_message non-tracking@{u} 2>actual &&
 132        test_i18ncmp expect actual
 133'
 134
 135test_expect_success '@{u} error message when no upstream' '
 136        cat >expect <<-EOF &&
 137        error: No upstream configured for branch ${sq}master${sq}
 138        fatal: Needed a single revision
 139        EOF
 140        test_must_fail git rev-parse --verify @{u} 2>actual &&
 141        test_i18ncmp expect actual
 142'
 143
 144test_expect_success 'branch@{u} error message with misspelt branch' '
 145        cat >expect <<-EOF &&
 146        error: No such branch: ${sq}no-such-branch${sq}
 147        fatal: Needed a single revision
 148        EOF
 149        error_message no-such-branch@{u} 2>actual &&
 150        test_i18ncmp expect actual
 151'
 152
 153test_expect_success '@{u} error message when not on a branch' '
 154        cat >expect <<-EOF &&
 155        error: HEAD does not point to a branch
 156        fatal: Needed a single revision
 157        EOF
 158        git checkout HEAD^0 &&
 159        test_must_fail git rev-parse --verify @{u} 2>actual &&
 160        test_i18ncmp expect actual
 161'
 162
 163test_expect_success 'branch@{u} error message if upstream branch not fetched' '
 164        cat >expect <<-EOF &&
 165        error: Upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
 166        fatal: Needed a single revision
 167        EOF
 168        error_message bad-upstream@{u} 2>actual &&
 169        test_i18ncmp expect actual
 170'
 171
 172test_expect_success 'pull works when tracking a local branch' '
 173(
 174        cd clone &&
 175        git checkout local-master &&
 176        git pull
 177)
 178'
 179
 180# makes sense if the previous one succeeded
 181test_expect_success '@{u} works when tracking a local branch' '
 182        test refs/heads/master = "$(full_name @{u})"
 183'
 184
 185cat >expect <<EOF
 186commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
 187Reflog: master@{0} (C O Mitter <committer@example.com>)
 188Reflog message: branch: Created from HEAD
 189Author: A U Thor <author@example.com>
 190Date:   Thu Apr 7 15:15:13 2005 -0700
 191
 192    3
 193EOF
 194test_expect_success 'log -g other@{u}' '
 195        git log -1 -g other@{u} >actual &&
 196        test_cmp expect actual
 197'
 198
 199cat >expect <<EOF
 200commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
 201Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
 202Reflog message: branch: Created from HEAD
 203Author: A U Thor <author@example.com>
 204Date:   Thu Apr 7 15:15:13 2005 -0700
 205
 206    3
 207EOF
 208
 209test_expect_success 'log -g other@{u}@{now}' '
 210        git log -1 -g other@{u}@{now} >actual &&
 211        test_cmp expect actual
 212'
 213
 214test_done