blob: d709ecf8df136539a746ef1873821baee6fab428 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
#!/bin/sh
test_description='test @{-N} syntax'
. ./test-lib.sh
make_commit () {
echo "$1" > "$1" &&
git add "$1" &&
git commit -m "$1"
}
test_expect_success 'setup' '
make_commit 1 &&
git branch side &&
make_commit 2 &&
make_commit 3 &&
git checkout side &&
make_commit 4 &&
git merge master &&
git checkout master
'
# 1 -- 2 -- 3 master
# \ \
# \ \
# --- 4 --- 5 side
#
# and 'side' should be the last branch
test_rev_equivalent () {
git rev-parse "$1" > expect &&
git rev-parse "$2" > output &&
test_cmp expect output
}
test_expect_success '@{-1} works' '
test_rev_equivalent side @{-1}
'
test_expect_success '@{-1}~2 works' '
test_rev_equivalent side~2 @{-1}~2
'
test_expect_success '@{-1}^2 works' '
test_rev_equivalent side^2 @{-1}^2
'
test_expect_success '@{-1}@{1} works' '
test_rev_equivalent side@{1} @{-1}@{1}
'
test_expect_success '@{-2} works' '
test_rev_equivalent master @{-2}
'
test_expect_success '@{-3} fails' '
test_must_fail git rev-parse @{-3}
'
test_done
|
