Merge branch 'nd/worktree-add-B'
[git] / t / t1508-at-combinations.sh
1 #!/bin/sh
2
3 test_description='test various @{X} syntax combinations together'
4 . ./test-lib.sh
5
6 check() {
7         test_expect_${4:-success} "$1 = $3" "
8                 echo '$3' >expect &&
9                 if test '$2' = 'commit'
10                 then
11                         git log -1 --format=%s '$1' >actual
12                 elif test '$2' = 'ref'
13                 then
14                         git rev-parse --symbolic-full-name '$1' >actual
15                 else
16                         git cat-file -p '$1' >actual
17                 fi &&
18                 test_cmp expect actual
19         "
20 }
21
22 nonsense() {
23         test_expect_${2:-success} "$1 is nonsensical" "
24                 test_must_fail git rev-parse --verify '$1'
25         "
26 }
27
28 fail() {
29         "$@" failure
30 }
31
32 test_expect_success 'setup' '
33         test_commit master-one &&
34         test_commit master-two &&
35         git checkout -b upstream-branch &&
36         test_commit upstream-one &&
37         test_commit upstream-two &&
38         if test_have_prereq !MINGW
39         then
40                 git checkout -b @/at-test
41         fi &&
42         git checkout -b @@/at-test &&
43         git checkout -b @at-test &&
44         git checkout -b old-branch &&
45         test_commit old-one &&
46         test_commit old-two &&
47         git checkout -b new-branch &&
48         test_commit new-one &&
49         test_commit new-two &&
50         git branch -u master old-branch &&
51         git branch -u upstream-branch new-branch
52 '
53
54 check HEAD ref refs/heads/new-branch
55 check "@{1}" commit new-one
56 check "HEAD@{1}" commit new-one
57 check "@{now}" commit new-two
58 check "HEAD@{now}" commit new-two
59 check "@{-1}" ref refs/heads/old-branch
60 check "@{-1}@{0}" commit old-two
61 check "@{-1}@{1}" commit old-one
62 check "@{u}" ref refs/heads/upstream-branch
63 check "HEAD@{u}" ref refs/heads/upstream-branch
64 check "@{u}@{1}" commit upstream-one
65 check "@{-1}@{u}" ref refs/heads/master
66 check "@{-1}@{u}@{1}" commit master-one
67 check "@" commit new-two
68 check "@@{u}" ref refs/heads/upstream-branch
69 check "@@/at-test" ref refs/heads/@@/at-test
70 test_have_prereq MINGW ||
71 check "@/at-test" ref refs/heads/@/at-test
72 check "@at-test" ref refs/heads/@at-test
73 nonsense "@{u}@{-1}"
74 nonsense "@{0}@{0}"
75 nonsense "@{1}@{u}"
76 nonsense "HEAD@{-1}"
77 nonsense "@{-1}@{-1}"
78
79 # @{N} versus HEAD@{N}
80
81 check "HEAD@{3}" commit old-two
82 nonsense "@{3}"
83
84 test_expect_success 'switch to old-branch' '
85         git checkout old-branch
86 '
87
88 check HEAD ref refs/heads/old-branch
89 check "HEAD@{1}" commit new-two
90 check "@{1}" commit old-one
91
92 test_expect_success 'create path with @' '
93         echo content >normal &&
94         echo content >fun@ny &&
95         git add normal fun@ny &&
96         git commit -m "funny path"
97 '
98
99 check "@:normal" blob content
100 check "@:fun@ny" blob content
101
102 test_done