Merge branch 'nd/gc-lock-against-each-other'
[git/raj.git] / t / t1508-at-combinations.sh
blobe5aea3b89602fdaf5ed3a9a230a604dd3f48cda0
1 #!/bin/sh
3 test_description='test various @{X} syntax combinations together'
4 . ./test-lib.sh
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 else
13 git rev-parse --symbolic-full-name '$1' >actual
14 fi &&
15 test_cmp expect actual
19 nonsense() {
20 test_expect_${2:-success} "$1 is nonsensical" "
21 test_must_fail git rev-parse --verify '$1'
25 fail() {
26 "$@" failure
29 test_expect_success 'setup' '
30 test_commit master-one &&
31 test_commit master-two &&
32 git checkout -b upstream-branch &&
33 test_commit upstream-one &&
34 test_commit upstream-two &&
35 git checkout -b old-branch &&
36 test_commit old-one &&
37 test_commit old-two &&
38 git checkout -b new-branch &&
39 test_commit new-one &&
40 test_commit new-two &&
41 git branch -u master old-branch &&
42 git branch -u upstream-branch new-branch
45 check HEAD ref refs/heads/new-branch
46 check "@{1}" commit new-one
47 check "HEAD@{1}" commit new-one
48 check "@{now}" commit new-two
49 check "HEAD@{now}" commit new-two
50 check "@{-1}" ref refs/heads/old-branch
51 check "@{-1}@{0}" commit old-two
52 check "@{-1}@{1}" commit old-one
53 check "@{u}" ref refs/heads/upstream-branch
54 check "HEAD@{u}" ref refs/heads/upstream-branch
55 check "@{u}@{1}" commit upstream-one
56 check "@{-1}@{u}" ref refs/heads/master
57 check "@{-1}@{u}@{1}" commit master-one
58 nonsense "@{u}@{-1}"
59 nonsense "@{0}@{0}"
60 nonsense "@{1}@{u}"
61 nonsense "HEAD@{-1}"
62 nonsense "@{-1}@{-1}"
64 # @{N} versus HEAD@{N}
66 check "HEAD@{3}" commit old-two
67 nonsense "@{3}"
69 test_expect_success 'switch to old-branch' '
70 git checkout old-branch
73 check HEAD ref refs/heads/old-branch
74 check "HEAD@{1}" commit new-two
75 check "@{1}" commit old-one
77 test_done