Merge branch 'kf/post-receive-sample-hook'
[git/jnareb-git.git] / t / t1507-rev-parse-upstream.sh
blob8c8dfdaf9f037f370629f419af02aa7a9d75f613
1 #!/bin/sh
3 test_description='test <branch>@{upstream} syntax'
5 . ./test-lib.sh
8 test_expect_success 'setup' '
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)
22 full_name () {
23 (cd clone &&
24 git rev-parse --symbolic-full-name "$@")
27 commit_subject () {
28 (cd clone &&
29 git show -s --pretty=format:%s "$@")
32 test_expect_success '@{upstream} resolves to correct full name' '
33 test refs/remotes/origin/master = "$(full_name @{upstream})"
36 test_expect_success '@{u} resolves to correct full name' '
37 test refs/remotes/origin/master = "$(full_name @{u})"
40 test_expect_success 'my-side@{upstream} resolves to correct full name' '
41 test refs/remotes/origin/side = "$(full_name my-side@{u})"
44 test_expect_success 'my-side@{u} resolves to correct commit' '
45 git checkout side &&
46 test_commit 5 &&
47 (cd clone && git fetch) &&
48 test 2 = "$(commit_subject my-side)" &&
49 test 5 = "$(commit_subject my-side@{u})"
52 test_expect_success 'not-tracking@{u} fails' '
53 test_must_fail full_name non-tracking@{u} &&
54 (cd clone && git checkout --no-track -b non-tracking) &&
55 test_must_fail full_name non-tracking@{u}
58 test_expect_success '<branch>@{u}@{1} resolves correctly' '
59 test_commit 6 &&
60 (cd clone && git fetch) &&
61 test 5 = $(commit_subject my-side@{u}@{1})
64 test_expect_success '@{u} without specifying branch fails on a detached HEAD' '
65 git checkout HEAD^0 &&
66 test_must_fail git rev-parse @{u}
69 test_expect_success 'checkout -b new my-side@{u} forks from the same' '
71 cd clone &&
72 git checkout -b new my-side@{u} &&
73 git rev-parse --symbolic-full-name my-side@{u} >expect &&
74 git rev-parse --symbolic-full-name new@{u} >actual &&
75 test_cmp expect actual
79 test_expect_success 'merge my-side@{u} records the correct name' '
81 sq="'\''" &&
82 cd clone || exit
83 git checkout master || exit
84 git branch -D new ;# can fail but is ok
85 git branch -t new my-side@{u} &&
86 git merge -s ours new@{u} &&
87 git show -s --pretty=format:%s >actual &&
88 echo "Merge remote branch ${sq}origin/side${sq}" >expect &&
89 test_cmp expect actual
93 test_expect_success 'branch -d other@{u}' '
94 git checkout -t -b other master &&
95 git branch -d @{u} &&
96 git for-each-ref refs/heads/master >actual &&
97 >expect &&
98 test_cmp expect actual
101 test_expect_success 'checkout other@{u}' '
102 git branch -f master HEAD &&
103 git checkout -t -b another master &&
104 git checkout @{u} &&
105 git symbolic-ref HEAD >actual &&
106 echo refs/heads/master >expect &&
107 test_cmp expect actual
110 cat >expect <<EOF
111 commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
112 Reflog: master@{0} (C O Mitter <committer@example.com>)
113 Reflog message: branch: Created from HEAD
114 Author: A U Thor <author@example.com>
115 Date: Thu Apr 7 15:15:13 2005 -0700
119 test_expect_success 'log -g other@{u}' '
120 git log -1 -g other@{u} >actual &&
121 test_cmp expect actual
124 cat >expect <<EOF
125 commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
126 Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
127 Reflog message: branch: Created from HEAD
128 Author: A U Thor <author@example.com>
129 Date: Thu Apr 7 15:15:13 2005 -0700
134 test_expect_success 'log -g other@{u}@{now}' '
135 git log -1 -g other@{u}@{now} >actual &&
136 test_cmp expect actual
139 test_done