mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / t / t6120-describe.sh
blobae8ee11183833fd4610adb1f83763eba381f7850
1 #!/bin/sh
3 test_description='test describe
6 .--------------o----o----o----x
7 / / /
8 o----o----o----o----o----. /
9 \ A c /
10 .------------o---o---o
11 D e
13 . ./test-lib.sh
15 check_describe () {
16 expect="$1"
17 shift
18 R=$(git describe "$@") &&
19 test_expect_success "describe $*" '
20 case "$R" in
21 $expect) echo happy ;;
22 *) echo "Oops - $R is not $expect";
23 false ;;
24 esac
28 test_expect_success setup '
30 test_tick &&
31 echo one >file && git add file && git-commit -m initial &&
32 one=$(git rev-parse HEAD) &&
34 test_tick &&
35 echo two >file && git add file && git-commit -m second &&
36 two=$(git rev-parse HEAD) &&
38 test_tick &&
39 echo three >file && git add file && git-commit -m third &&
41 test_tick &&
42 echo A >file && git add file && git-commit -m A &&
43 test_tick &&
44 git-tag -a -m A A &&
46 test_tick &&
47 echo c >file && git add file && git-commit -m c &&
48 test_tick &&
49 git-tag c &&
51 git reset --hard $two &&
52 test_tick &&
53 echo B >side && git add side && git-commit -m B &&
54 test_tick &&
55 git-tag -a -m B B &&
57 test_tick &&
58 git-merge -m Merged c &&
59 merged=$(git rev-parse HEAD) &&
61 git reset --hard $two &&
62 test_tick &&
63 echo D >another && git add another && git-commit -m D &&
64 test_tick &&
65 git-tag -a -m D D &&
67 test_tick &&
68 echo DD >another && git commit -a -m another &&
70 test_tick &&
71 git-tag e &&
73 test_tick &&
74 echo DDD >another && git commit -a -m "yet another" &&
76 test_tick &&
77 git-merge -m Merged $merged &&
79 test_tick &&
80 echo X >file && echo X >side && git add file side &&
81 git-commit -m x
85 check_describe A-* HEAD
86 check_describe A-* HEAD^
87 check_describe D-* HEAD^^
88 check_describe A-* HEAD^^2
89 check_describe B HEAD^^2^
91 check_describe A-* --tags HEAD
92 check_describe A-* --tags HEAD^
93 check_describe D-* --tags HEAD^^
94 check_describe A-* --tags HEAD^^2
95 check_describe B --tags HEAD^^2^
97 test_done