31
}
32
33
test_expect_success setup '
34
+ test_commit initial file one &&
35
+ test_commit second file two &&
36
+ test_commit third file three &&
37
+ test_commit --annotate A file A &&
38
+ test_commit c file c &&
39
35
- test_tick &&
36
- echo one >file && git add file && git commit -m initial &&
37
- one=$(git rev-parse HEAD) &&
38
-
39
- git describe --always HEAD &&
40
-
41
- test_tick &&
42
- echo two >file && git add file && git commit -m second &&
43
- two=$(git rev-parse HEAD) &&
44
-
45
- test_tick &&
46
- echo three >file && git add file && git commit -m third &&
47
-
48
- test_tick &&
49
- echo A >file && git add file && git commit -m A &&
50
- test_tick &&
51
- git tag -a -m A A &&
52
-
53
- test_tick &&
54
- echo c >file && git add file && git commit -m c &&
55
- test_tick &&
56
- git tag c &&
57
-
58
- git reset --hard $two &&
59
- test_tick &&
60
- echo B >side && git add side && git commit -m B &&
61
- test_tick &&
62
- git tag -a -m B B &&
40
+ git reset --hard second &&
41
+ test_commit --annotate B side B &&
42
43
test_tick &&
44
git merge -m Merged c &&
45
merged=$(git rev-parse HEAD) &&
46
68
- git reset --hard $two &&
69
- test_tick &&
70
- echo D >another && git add another && git commit -m D &&
71
- test_tick &&
72
- git tag -a -m D D &&
73
- test_tick &&
74
- git tag -a -m R R &&
75
-
76
- test_tick &&
77
- echo DD >another && git commit -a -m another &&
47
+ git reset --hard second &&
48
+ test_commit --no-tag D another D &&
49
50
test_tick &&
80
- git tag e &&
51
+ git tag -a -m R R &&
52
82
- test_tick &&
83
- echo DDD >another && git commit -a -m "yet another" &&
53
+ test_commit e another DD &&
54
+ test_commit --no-tag "yet another" another DDD &&
55
56
test_tick &&
57
git merge -m Merged $merged &&
58
88
- test_tick &&
89
- echo X >file && echo X >side && git add file side &&
90
- git commit -m x
91
-
59
+ test_commit --no-tag x file
60
'
61
62
check_describe A-* HEAD