3 test_description
='test various @{X} syntax combinations together'
4 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
=master
5 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10 test_expect_
${4:-success} "$1 = $3" "
12 if test '$2' = 'commit'
14 git log -1 --format=%s '$1' >actual
15 elif test '$2' = 'ref'
17 git rev-parse --symbolic-full-name '$1' >actual
19 git cat-file -p '$1' >actual
21 test_cmp expect actual
26 test_expect_
${2:-success} "$1 is nonsensical" "
27 test_must_fail git rev-parse --verify '$1'
35 test_expect_success
'setup' '
36 test_commit master-one &&
37 test_commit master-two &&
38 git checkout -b upstream-branch &&
39 test_commit upstream-one &&
40 test_commit upstream-two &&
41 if test_have_prereq !MINGW
43 git checkout -b @/at-test
45 git checkout -b @@/at-test &&
46 git checkout -b @at-test &&
47 git checkout -b old-branch &&
48 test_commit old-one &&
49 test_commit old-two &&
50 git checkout -b new-branch &&
51 test_commit new-one &&
52 test_commit new-two &&
53 git branch -u master old-branch &&
54 git branch -u upstream-branch new-branch
57 check HEAD ref refs
/heads
/new-branch
58 check
"@{1}" commit new-one
59 check
"HEAD@{1}" commit new-one
60 check
"@{now}" commit new-two
61 check
"HEAD@{now}" commit new-two
62 check
"@{-1}" ref refs
/heads
/old-branch
63 check
"@{-1}@{0}" commit old-two
64 check
"@{-1}@{1}" commit old-one
65 check
"@{u}" ref refs
/heads
/upstream-branch
66 check
"HEAD@{u}" ref refs
/heads
/upstream-branch
67 check
"@{u}@{1}" commit upstream-one
68 check
"@{-1}@{u}" ref refs
/heads
/master
69 check
"@{-1}@{u}@{1}" commit master-one
70 check
"@" commit new-two
71 check
"@@{u}" ref refs
/heads
/upstream-branch
72 check
"@@/at-test" ref refs
/heads
/@@
/at-test
73 test_have_prereq MINGW ||
74 check
"@/at-test" ref refs
/heads
/@
/at-test
75 check
"@at-test" ref refs
/heads
/@at-test
82 # @{N} versus HEAD@{N}
84 check
"HEAD@{3}" commit old-two
87 test_expect_success
'switch to old-branch' '
88 git checkout old-branch
91 check HEAD ref refs
/heads
/old-branch
92 check
"HEAD@{1}" commit new-two
93 check
"@{1}" commit old-one
95 test_expect_success
'create path with @' '
96 echo content >normal &&
97 echo content >fun@ny &&
98 git add normal fun@ny &&
99 git commit -m "funny path"
102 check
"@:normal" blob content
103 check
"@:fun@ny" blob content