t / t6120-describe.shon commit format-patch: respect --stat in cover letter's diffstat (284aeb7)
   1#!/bin/sh
   2
   3test_description='test describe
   4
   5                       B
   6        .--------------o----o----o----x
   7       /                   /    /
   8 o----o----o----o----o----.    /
   9       \        A    c        /
  10        .------------o---o---o
  11                   D,R   e
  12'
  13. ./test-lib.sh
  14
  15check_describe () {
  16        expect="$1"
  17        shift
  18        R=$(git describe "$@" 2>err.actual)
  19        S=$?
  20        cat err.actual >&3
  21        test_expect_success "describe $*" '
  22        test $S = 0 &&
  23        case "$R" in
  24        $expect)        echo happy ;;
  25        *)      echo "Oops - $R is not $expect";
  26                false ;;
  27        esac
  28        '
  29}
  30
  31test_expect_success setup '
  32
  33        test_tick &&
  34        echo one >file && git add file && git commit -m initial &&
  35        one=$(git rev-parse HEAD) &&
  36
  37        git describe --always HEAD &&
  38
  39        test_tick &&
  40        echo two >file && git add file && git commit -m second &&
  41        two=$(git rev-parse HEAD) &&
  42
  43        test_tick &&
  44        echo three >file && git add file && git commit -m third &&
  45
  46        test_tick &&
  47        echo A >file && git add file && git commit -m A &&
  48        test_tick &&
  49        git tag -a -m A A &&
  50
  51        test_tick &&
  52        echo c >file && git add file && git commit -m c &&
  53        test_tick &&
  54        git tag c &&
  55
  56        git reset --hard $two &&
  57        test_tick &&
  58        echo B >side && git add side && git commit -m B &&
  59        test_tick &&
  60        git tag -a -m B B &&
  61
  62        test_tick &&
  63        git merge -m Merged c &&
  64        merged=$(git rev-parse HEAD) &&
  65
  66        git reset --hard $two &&
  67        test_tick &&
  68        echo D >another && git add another && git commit -m D &&
  69        test_tick &&
  70        git tag -a -m D D &&
  71        test_tick &&
  72        git tag -a -m R R &&
  73
  74        test_tick &&
  75        echo DD >another && git commit -a -m another &&
  76
  77        test_tick &&
  78        git tag e &&
  79
  80        test_tick &&
  81        echo DDD >another && git commit -a -m "yet another" &&
  82
  83        test_tick &&
  84        git merge -m Merged $merged &&
  85
  86        test_tick &&
  87        echo X >file && echo X >side && git add file side &&
  88        git commit -m x
  89
  90'
  91
  92check_describe A-* HEAD
  93check_describe A-* HEAD^
  94check_describe R-* HEAD^^
  95check_describe A-* HEAD^^2
  96check_describe B HEAD^^2^
  97check_describe R-* HEAD^^^
  98
  99check_describe c-* --tags HEAD
 100check_describe c-* --tags HEAD^
 101check_describe e-* --tags HEAD^^
 102check_describe c-* --tags HEAD^^2
 103check_describe B --tags HEAD^^2^
 104check_describe e --tags HEAD^^^
 105
 106check_describe heads/master --all HEAD
 107check_describe tags/c-* --all HEAD^
 108check_describe tags/e --all HEAD^^^
 109
 110check_describe B-0-* --long HEAD^^2^
 111check_describe A-3-* --long HEAD^^2
 112
 113check_describe c-7-* --tags
 114check_describe e-3-* --first-parent --tags
 115
 116test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
 117        echo "A^0" >expect &&
 118        git checkout A &&
 119        test_when_finished "git checkout -" &&
 120        git describe --contains >actual &&
 121        test_cmp expect actual
 122'
 123
 124check_describe tags/A --all A^0
 125test_expect_success 'no warning was displayed for A' '
 126        test_must_be_empty err.actual
 127'
 128
 129test_expect_success 'rename tag A to Q locally' '
 130        mv .git/refs/tags/A .git/refs/tags/Q
 131'
 132cat - >err.expect <<EOF
 133warning: tag 'A' is really 'Q' here
 134EOF
 135check_describe A-* HEAD
 136test_expect_success 'warning was displayed for Q' '
 137        test_i18ncmp err.expect err.actual
 138'
 139test_expect_success 'rename tag Q back to A' '
 140        mv .git/refs/tags/Q .git/refs/tags/A
 141'
 142
 143test_expect_success 'pack tag refs' 'git pack-refs'
 144check_describe A-* HEAD
 145
 146check_describe "A-*[0-9a-f]" --dirty
 147
 148test_expect_success 'set-up dirty work tree' '
 149        echo >>file
 150'
 151
 152check_describe "A-*[0-9a-f]-dirty" --dirty
 153
 154check_describe "A-*[0-9a-f].mod" --dirty=.mod
 155
 156test_expect_success 'describe --dirty HEAD' '
 157        test_must_fail git describe --dirty HEAD
 158'
 159
 160test_expect_success 'set-up matching pattern tests' '
 161        git tag -a -m test-annotated test-annotated &&
 162        echo >>file &&
 163        test_tick &&
 164        git commit -a -m "one more" &&
 165        git tag test1-lightweight &&
 166        echo >>file &&
 167        test_tick &&
 168        git commit -a -m "yet another" &&
 169        git tag test2-lightweight &&
 170        echo >>file &&
 171        test_tick &&
 172        git commit -a -m "even more"
 173
 174'
 175
 176check_describe "test-annotated-*" --match="test-*"
 177
 178check_describe "test1-lightweight-*" --tags --match="test1-*"
 179
 180check_describe "test2-lightweight-*" --tags --match="test2-*"
 181
 182check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
 183
 184check_describe "test2-lightweight-*" --long --tags --match="test1-*" --match="test2-*" HEAD^
 185
 186check_describe "test2-lightweight-*" --long --tags --match="test1-*" --no-match --match="test2-*" HEAD^
 187
 188check_describe "test1-lightweight-*" --long --tags --match="test1-*" --match="test3-*" HEAD
 189
 190check_describe "test1-lightweight-*" --long --tags --match="test3-*" --match="test1-*" HEAD
 191
 192test_expect_success 'set-up branches' '
 193        git branch branch_A A &&
 194        git branch branch_C c &&
 195        git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
 196        git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
 197        git update-ref refs/original/original_branch_A test-annotated~2
 198'
 199
 200check_describe "heads/branch_A*" --all --match="branch_*" --exclude="branch_C" HEAD
 201
 202check_describe "remotes/origin/remote_branch_A*" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD
 203
 204check_describe "original/original_branch_A*" --all test-annotated~1
 205
 206test_expect_success '--match does not work for other types' '
 207        test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
 208'
 209
 210test_expect_success '--exclude does not work for other types' '
 211        R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
 212        case "$R" in
 213        *original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
 214                false;;
 215        *) echo ok: Found some known type;;
 216        esac
 217'
 218
 219test_expect_success 'name-rev with exact tags' '
 220        echo A >expect &&
 221        tag_object=$(git rev-parse refs/tags/A) &&
 222        git name-rev --tags --name-only $tag_object >actual &&
 223        test_cmp expect actual &&
 224
 225        echo "A^0" >expect &&
 226        tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 227        git name-rev --tags --name-only $tagged_commit >actual &&
 228        test_cmp expect actual
 229'
 230
 231test_expect_success 'name-rev --all' '
 232        >expect.unsorted &&
 233        for rev in $(git rev-list --all)
 234        do
 235                git name-rev $rev >>expect.unsorted
 236        done &&
 237        sort <expect.unsorted >expect &&
 238        git name-rev --all >actual.unsorted &&
 239        sort <actual.unsorted >actual &&
 240        test_cmp expect actual
 241'
 242
 243test_expect_success 'name-rev --stdin' '
 244        >expect.unsorted &&
 245        for rev in $(git rev-list --all)
 246        do
 247                name=$(git name-rev --name-only $rev) &&
 248                echo "$rev ($name)" >>expect.unsorted
 249        done &&
 250        sort <expect.unsorted >expect &&
 251        git rev-list --all | git name-rev --stdin >actual.unsorted &&
 252        sort <actual.unsorted >actual &&
 253        test_cmp expect actual
 254'
 255
 256test_expect_success 'describe --contains with the exact tags' '
 257        echo "A^0" >expect &&
 258        tag_object=$(git rev-parse refs/tags/A) &&
 259        git describe --contains $tag_object >actual &&
 260        test_cmp expect actual &&
 261
 262        echo "A^0" >expect &&
 263        tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 264        git describe --contains $tagged_commit >actual &&
 265        test_cmp expect actual
 266'
 267
 268test_expect_success 'describe --contains and --match' '
 269        echo "A^0" >expect &&
 270        tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 271        test_must_fail git describe --contains --match="B" $tagged_commit &&
 272        git describe --contains --match="B" --match="A" $tagged_commit >actual &&
 273        test_cmp expect actual
 274'
 275
 276test_expect_success 'describe --exclude' '
 277        echo "c~1" >expect &&
 278        tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 279        test_must_fail git describe --contains --match="B" $tagged_commit &&
 280        git describe --contains --match="?" --exclude="A" $tagged_commit >actual &&
 281        test_cmp expect actual
 282'
 283
 284test_expect_success 'describe --contains and --no-match' '
 285        echo "A^0" >expect &&
 286        tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 287        git describe --contains --match="B" --no-match $tagged_commit >actual &&
 288        test_cmp expect actual
 289'
 290
 291test_expect_success 'setup and absorb a submodule' '
 292        test_create_repo sub1 &&
 293        test_commit -C sub1 initial &&
 294        git submodule add ./sub1 &&
 295        git submodule absorbgitdirs &&
 296        git commit -a -m "add submodule" &&
 297        git describe --dirty >expect &&
 298        git describe --broken >out &&
 299        test_cmp expect out
 300'
 301
 302test_expect_success 'describe chokes on severely broken submodules' '
 303        mv .git/modules/sub1/ .git/modules/sub_moved &&
 304        test_must_fail git describe --dirty
 305'
 306test_expect_success 'describe ignoring a broken submodule' '
 307        git describe --broken >out &&
 308        test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
 309        grep broken out
 310'
 311
 312test_expect_success 'describe a blob at a directly tagged commit' '
 313        echo "make it a unique blob" >file &&
 314        git add file && git commit -m "content in file" &&
 315        git tag -a -m "latest annotated tag" unique-file &&
 316        git describe HEAD:file >actual &&
 317        echo "unique-file:file" >expect &&
 318        test_cmp expect actual
 319'
 320
 321test_expect_success 'describe a blob with its first introduction' '
 322        git commit --allow-empty -m "empty commit" &&
 323        git rm file &&
 324        git commit -m "delete blob" &&
 325        git revert HEAD &&
 326        git commit --allow-empty -m "empty commit" &&
 327        git describe HEAD:file >actual &&
 328        echo "unique-file:file" >expect &&
 329        test_cmp expect actual
 330'
 331
 332test_expect_success 'describe directly tagged blob' '
 333        git tag test-blob unique-file:file &&
 334        git describe test-blob >actual &&
 335        echo "unique-file:file" >expect &&
 336        # suboptimal: we rather want to see "test-blob"
 337        test_cmp expect actual
 338'
 339
 340test_expect_success 'describe tag object' '
 341        git tag test-blob-1 -a -m msg unique-file:file &&
 342        test_must_fail git describe test-blob-1 2>actual &&
 343        test_i18ngrep "fatal: test-blob-1 is neither a commit nor blob" actual
 344'
 345
 346test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
 347        i=1 &&
 348        while test $i -lt 8000
 349        do
 350                echo "commit refs/heads/master
 351committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
 352data <<EOF
 353commit #$i
 354EOF"
 355                test $i = 1 && echo "from refs/heads/master^0"
 356                i=$(($i + 1))
 357        done | git fast-import &&
 358        git checkout master &&
 359        git tag far-far-away HEAD^ &&
 360        echo "HEAD~4000 tags/far-far-away~3999" >expect &&
 361        git name-rev HEAD~4000 >actual &&
 362        test_cmp expect actual &&
 363        run_with_limited_stack git name-rev HEAD~4000 >actual &&
 364        test_cmp expect actual
 365'
 366
 367test_expect_success ULIMIT_STACK_SIZE 'describe works in a deep repo' '
 368        git tag -f far-far-away HEAD~7999 &&
 369        echo "far-far-away" >expect &&
 370        git describe --tags --abbrev=0 HEAD~4000 >actual &&
 371        test_cmp expect actual &&
 372        run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
 373        test_cmp expect actual
 374'
 375
 376check_describe tags/A --all A
 377check_describe tags/c --all c
 378check_describe heads/branch_A --all --match='branch_*' branch_A
 379
 380test_expect_success 'describe complains about tree object' '
 381        test_must_fail git describe HEAD^{tree}
 382'
 383
 384test_expect_success 'describe complains about missing object' '
 385        test_must_fail git describe $ZERO_OID
 386'
 387
 388test_done