t/t6120-describe.sh

   1 #!/bin/sh
   2
   3 test_description='test describe'
   4
   5 #  o---o-----o----o----o-------o----x
   6 #       \   D,R   e           /
   7 #        \---o-------------o-'
   8 #         \  B            /
   9 #          `-o----o----o-'
  10 #                 A    c
  11 #
  12 # First parent of a merge commit is on the same line, second parent below.
  13
  14 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
  15 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
  16
  17 TEST_PASSES_SANITIZE_LEAK=true
  18 . ./test-lib.sh
  19
  20 check_describe () {
  21         indir= &&
  22         while test $# != 0
  23         do
  24                 case "$1" in
  25                 -C)
  26                         indir="$2"
  27                         shift
  28                         ;;
  29                 *)
  30                         break
  31                         ;;
  32                 esac
  33                 shift
  34         done &&
  35         indir=${indir:+"$indir"/} &&
  36         expect="$1"
  37         shift
  38         describe_opts="$@"
  39         test_expect_success "describe $describe_opts" '
  40                 git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
  41                 sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
  42                 echo "$expect" >expect &&
  43                 test_cmp expect actual
  44         '
  45 }
  46
  47 test_expect_success setup '
  48         test_commit initial file one &&
  49         test_commit second file two &&
  50         test_commit third file three &&
  51         test_commit --annotate A file A &&
  52         test_commit c file c &&
  53
  54         git reset --hard second &&
  55         test_commit --annotate B side B &&
  56
  57         test_tick &&
  58         git merge -m Merged c &&
  59         merged=$(git rev-parse HEAD) &&
  60
  61         git reset --hard second &&
  62         test_commit --no-tag D another D &&
  63
  64         test_tick &&
  65         git tag -a -m R R &&
  66
  67         test_commit e another DD &&
  68         test_commit --no-tag "yet another" another DDD &&
  69
  70         test_tick &&
  71         git merge -m Merged $merged &&
  72
  73         test_commit --no-tag x file
  74 '
  75
  76 check_describe A-8-gHASH HEAD
  77 check_describe A-7-gHASH HEAD^
  78 check_describe R-2-gHASH HEAD^^
  79 check_describe A-3-gHASH HEAD^^2
  80 check_describe B HEAD^^2^
  81 check_describe R-1-gHASH HEAD^^^
  82
  83 check_describe c-7-gHASH --tags HEAD
  84 check_describe c-6-gHASH --tags HEAD^
  85 check_describe e-1-gHASH --tags HEAD^^
  86 check_describe c-2-gHASH --tags HEAD^^2
  87 check_describe B --tags HEAD^^2^
  88 check_describe e --tags HEAD^^^
  89 check_describe e --tags --exact-match HEAD^^^
  90
  91 check_describe heads/main --all HEAD
  92 check_describe tags/c-6-gHASH --all HEAD^
  93 check_describe tags/e --all HEAD^^^
  94
  95 check_describe B-0-gHASH --long HEAD^^2^
  96 check_describe A-3-gHASH --long HEAD^^2
  97
  98 check_describe c-7-gHASH --tags
  99 check_describe e-3-gHASH --first-parent --tags
 100
 101 check_describe c-7-gHASH --tags --no-exact-match HEAD
 102 check_describe e-3-gHASH --first-parent --tags --no-exact-match HEAD
 103
 104 test_expect_success '--exact-match failure' '
 105         test_must_fail git describe --exact-match HEAD 2>err
 106 '
 107
 108 test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
 109         echo "A^0" >expect &&
 110         git checkout A &&
 111         test_when_finished "git checkout -" &&
 112         git describe --contains >actual &&
 113         test_cmp expect actual
 114 '
 115
 116 check_describe tags/A --all A^0
 117
 118 test_expect_success 'renaming tag A to Q locally produces a warning' "
 119         git update-ref refs/tags/Q $(git rev-parse refs/tags/A) &&
 120         git update-ref -d refs/tags/A &&
 121         git describe HEAD 2>err >out &&
 122         cat >expected <<-\EOF &&
 123         warning: tag 'Q' is externally known as 'A'
 124         EOF
 125         test_cmp expected err &&
 126         grep -E '^A-8-g[0-9a-f]+$' out
 127 "
 128
 129 test_expect_success 'misnamed annotated tag forces long output' '
 130         description=$(git describe --no-long Q^0) &&
 131         expr "$description" : "A-0-g[0-9a-f]*$" &&
 132         git rev-parse --verify "$description" >actual &&
 133         git rev-parse --verify Q^0 >expect &&
 134         test_cmp expect actual
 135 '
 136
 137 test_expect_success 'abbrev=0 will not break misplaced tag (1)' '
 138         description=$(git describe --abbrev=0 Q^0) &&
 139         expr "$description" : "A-0-g[0-9a-f]*$"
 140 '
 141
 142 test_expect_success 'abbrev=0 will not break misplaced tag (2)' '
 143         description=$(git describe --abbrev=0 c^0) &&
 144         expr "$description" : "A-1-g[0-9a-f]*$"
 145 '
 146
 147 test_expect_success 'rename tag Q back to A' '
 148         git update-ref refs/tags/A $(git rev-parse refs/tags/Q) &&
 149         git update-ref -d refs/tags/Q
 150 '
 151
 152 test_expect_success 'pack tag refs' 'git pack-refs'
 153 check_describe A-8-gHASH HEAD
 154
 155 test_expect_success 'describe works from outside repo using --git-dir' '
 156         git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
 157         git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
 158         grep -E "^A-8-g[0-9a-f]+$" out
 159 '
 160
 161 check_describe "A-8-gHASH" --dirty
 162
 163 test_expect_success 'describe --dirty with --work-tree' '
 164         (
 165                 cd "$TEST_DIRECTORY" &&
 166                 git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
 167         ) &&
 168         grep -E "^A-8-g[0-9a-f]+$" out
 169 '
 170
 171 test_expect_success 'set-up dirty work tree' '
 172         echo >>file
 173 '
 174
 175 test_expect_success 'describe --dirty with --work-tree (dirty)' '
 176         git describe --dirty >expected &&
 177         (
 178                 cd "$TEST_DIRECTORY" &&
 179                 git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
 180         ) &&
 181         grep -E "^A-8-g[0-9a-f]+-dirty$" out &&
 182         test_cmp expected out
 183 '
 184
 185 test_expect_success 'describe --dirty=.mod with --work-tree (dirty)' '
 186         git describe --dirty=.mod >expected &&
 187         (
 188                 cd "$TEST_DIRECTORY" &&
 189                 git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
 190         ) &&
 191         grep -E "^A-8-g[0-9a-f]+.mod$" out &&
 192         test_cmp expected out
 193 '
 194
 195 test_expect_success 'describe --dirty HEAD' '
 196         test_must_fail git describe --dirty HEAD
 197 '
 198
 199 test_expect_success 'set-up matching pattern tests' '
 200         git tag -a -m test-annotated test-annotated &&
 201         echo >>file &&
 202         test_tick &&
 203         git commit -a -m "one more" &&
 204         git tag test1-lightweight &&
 205         echo >>file &&
 206         test_tick &&
 207         git commit -a -m "yet another" &&
 208         git tag test2-lightweight &&
 209         echo >>file &&
 210         test_tick &&
 211         git commit -a -m "even more"
 212
 213 '
 214
 215 check_describe "test-annotated-3-gHASH" --match="test-*"
 216
 217 check_describe "test1-lightweight-2-gHASH" --tags --match="test1-*"
 218
 219 check_describe "test2-lightweight-1-gHASH" --tags --match="test2-*"
 220
 221 check_describe "test2-lightweight-0-gHASH" --long --tags --match="test2-*" HEAD^
 222
 223 check_describe "test2-lightweight-0-gHASH" --long --tags --match="test1-*" --match="test2-*" HEAD^
 224
 225 check_describe "test2-lightweight-0-gHASH" --long --tags --match="test1-*" --no-match --match="test2-*" HEAD^
 226
 227 check_describe "test1-lightweight-2-gHASH" --long --tags --match="test1-*" --match="test3-*" HEAD
 228
 229 check_describe "test1-lightweight-2-gHASH" --long --tags --match="test3-*" --match="test1-*" HEAD
 230
 231 test_expect_success 'set-up branches' '
 232         git branch branch_A A &&
 233         git branch branch_C c &&
 234         git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
 235         git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
 236         git update-ref refs/original/original_branch_A test-annotated~2
 237 '
 238
 239 check_describe "heads/branch_A-11-gHASH" --all --match="branch_*" --exclude="branch_C" HEAD
 240
 241 check_describe "remotes/origin/remote_branch_A-11-gHASH" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD
 242
 243 check_describe "original/original_branch_A-6-gHASH" --all test-annotated~1
 244
 245 test_expect_success '--match does not work for other types' '
 246         test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
 247 '
 248
 249 test_expect_success '--exclude does not work for other types' '
 250         R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
 251         case "$R" in
 252         *original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
 253                 false;;
 254         *) echo ok: Found some known type;;
 255         esac
 256 '
 257
 258 test_expect_success 'name-rev with exact tags' '
 259         echo A >expect &&
 260         tag_object=$(git rev-parse refs/tags/A) &&
 261         git name-rev --tags --name-only $tag_object >actual &&
 262         test_cmp expect actual &&
 263
 264         echo "A^0" >expect &&
 265         tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 266         git name-rev --tags --name-only $tagged_commit >actual &&
 267         test_cmp expect actual
 268 '
 269
 270 test_expect_success 'name-rev --all' '
 271         >expect.unsorted &&
 272         for rev in $(git rev-list --all)
 273         do
 274                 git name-rev $rev >>expect.unsorted || return 1
 275         done &&
 276         sort <expect.unsorted >expect &&
 277         git name-rev --all >actual.unsorted &&
 278         sort <actual.unsorted >actual &&
 279         test_cmp expect actual
 280 '
 281
 282 test_expect_success 'name-rev --annotate-stdin' '
 283         >expect.unsorted &&
 284         for rev in $(git rev-list --all)
 285         do
 286                 name=$(git name-rev --name-only $rev) &&
 287                 echo "$rev ($name)" >>expect.unsorted || return 1
 288         done &&
 289         sort <expect.unsorted >expect &&
 290         git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
 291         sort <actual.unsorted >actual &&
 292         test_cmp expect actual
 293 '
 294
 295 test_expect_success 'name-rev --stdin deprecated' "
 296         git rev-list --all | git name-rev --stdin 2>actual &&
 297         grep -E 'warning: --stdin is deprecated' actual
 298 "
 299
 300 test_expect_success 'describe --contains with the exact tags' '
 301         echo "A^0" >expect &&
 302         tag_object=$(git rev-parse refs/tags/A) &&
 303         git describe --contains $tag_object >actual &&
 304         test_cmp expect actual &&
 305
 306         echo "A^0" >expect &&
 307         tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 308         git describe --contains $tagged_commit >actual &&
 309         test_cmp expect actual
 310 '
 311
 312 test_expect_success 'describe --contains and --match' '
 313         echo "A^0" >expect &&
 314         tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 315         test_must_fail git describe --contains --match="B" $tagged_commit &&
 316         git describe --contains --match="B" --match="A" $tagged_commit >actual &&
 317         test_cmp expect actual
 318 '
 319
 320 test_expect_success 'describe --exclude' '
 321         echo "c~1" >expect &&
 322         tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 323         test_must_fail git describe --contains --match="B" $tagged_commit &&
 324         git describe --contains --match="?" --exclude="A" $tagged_commit >actual &&
 325         test_cmp expect actual
 326 '
 327
 328 test_expect_success 'describe --contains and --no-match' '
 329         echo "A^0" >expect &&
 330         tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 331         git describe --contains --match="B" --no-match $tagged_commit >actual &&
 332         test_cmp expect actual
 333 '
 334
 335 test_expect_success 'setup and absorb a submodule' '
 336         test_create_repo sub1 &&
 337         test_commit -C sub1 initial &&
 338         git submodule add ./sub1 &&
 339         git submodule absorbgitdirs &&
 340         git commit -a -m "add submodule" &&
 341         git describe --dirty >expect &&
 342         git describe --broken >out &&
 343         test_cmp expect out
 344 '
 345
 346 test_expect_success 'describe chokes on severely broken submodules' '
 347         mv .git/modules/sub1/ .git/modules/sub_moved &&
 348         test_must_fail git describe --dirty
 349 '
 350
 351 test_expect_success 'describe ignoring a broken submodule' '
 352         git describe --broken >out &&
 353         grep broken out
 354 '
 355
 356 test_expect_success 'describe with --work-tree ignoring a broken submodule' '
 357         (
 358                 cd "$TEST_DIRECTORY" &&
 359                 git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --broken >"$TRASH_DIRECTORY/out"
 360         ) &&
 361         test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
 362         grep broken out
 363 '
 364
 365 test_expect_success 'describe a blob at a directly tagged commit' '
 366         echo "make it a unique blob" >file &&
 367         git add file && git commit -m "content in file" &&
 368         git tag -a -m "latest annotated tag" unique-file &&
 369         git describe HEAD:file >actual &&
 370         echo "unique-file:file" >expect &&
 371         test_cmp expect actual
 372 '
 373
 374 test_expect_success 'describe a blob with its first introduction' '
 375         git commit --allow-empty -m "empty commit" &&
 376         git rm file &&
 377         git commit -m "delete blob" &&
 378         git revert HEAD &&
 379         git commit --allow-empty -m "empty commit" &&
 380         git describe HEAD:file >actual &&
 381         echo "unique-file:file" >expect &&
 382         test_cmp expect actual
 383 '
 384
 385 test_expect_success 'describe directly tagged blob' '
 386         git tag test-blob unique-file:file &&
 387         git describe test-blob >actual &&
 388         echo "unique-file:file" >expect &&
 389         # suboptimal: we rather want to see "test-blob"
 390         test_cmp expect actual
 391 '
 392
 393 test_expect_success 'describe tag object' '
 394         git tag test-blob-1 -a -m msg unique-file:file &&
 395         test_must_fail git describe test-blob-1 2>actual &&
 396         test_grep "fatal: test-blob-1 is neither a commit nor blob" actual
 397 '
 398
 399 test_expect_success ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
 400         i=1 &&
 401         while test $i -lt 8000
 402         do
 403                 echo "commit refs/heads/main
 404 committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
 405 data <<EOF
 406 commit #$i
 407 EOF" &&
 408                 if test $i = 1
 409                 then
 410                         echo "from refs/heads/main^0"
 411                 fi &&
 412                 i=$(($i + 1)) || return 1
 413         done | git fast-import &&
 414         git checkout main &&
 415         git tag far-far-away HEAD^ &&
 416         echo "HEAD~4000 tags/far-far-away~3999" >expect &&
 417         git name-rev HEAD~4000 >actual &&
 418         test_cmp expect actual &&
 419         run_with_limited_stack git name-rev HEAD~4000 >actual &&
 420         test_cmp expect actual
 421 '
 422
 423 test_expect_success ULIMIT_STACK_SIZE 'describe works in a deep repo' '
 424         git tag -f far-far-away HEAD~7999 &&
 425         echo "far-far-away" >expect &&
 426         git describe --tags --abbrev=0 HEAD~4000 >actual &&
 427         test_cmp expect actual &&
 428         run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
 429         test_cmp expect actual
 430 '
 431
 432 check_describe tags/A --all A
 433 check_describe tags/c --all c
 434 check_describe heads/branch_A --all --match='branch_*' branch_A
 435
 436 test_expect_success 'describe complains about tree object' '
 437         test_must_fail git describe HEAD^{tree}
 438 '
 439
 440 test_expect_success 'describe complains about missing object' '
 441         test_must_fail git describe $ZERO_OID
 442 '
 443
 444 test_expect_success 'name-rev a rev shortly after epoch' '
 445         test_when_finished "git checkout main" &&
 446
 447         git checkout --orphan no-timestamp-underflow &&
 448         # Any date closer to epoch than the CUTOFF_DATE_SLOP constant
 449         # in builtin/name-rev.c.
 450         GIT_COMMITTER_DATE="@1234 +0000" \
 451         git commit -m "committer date shortly after epoch" &&
 452         old_commit_oid=$(git rev-parse HEAD) &&
 453
 454         echo "$old_commit_oid no-timestamp-underflow" >expect &&
 455         git name-rev $old_commit_oid >actual &&
 456         test_cmp expect actual
 457 '
 458
 459 # A--------------main
 460 #  \            /
 461 #   \----------M2
 462 #    \        /
 463 #     \---M1-C
 464 #      \ /
 465 #       B
 466 test_expect_success 'name-rev covers all conditions while looking at parents' '
 467         git init repo &&
 468         (
 469                 cd repo &&
 470
 471                 echo A >file &&
 472                 git add file &&
 473                 git commit -m A &&
 474                 A=$(git rev-parse HEAD) &&
 475
 476                 git checkout --detach &&
 477                 echo B >file &&
 478                 git commit -m B file &&
 479                 B=$(git rev-parse HEAD) &&
 480
 481                 git checkout $A &&
 482                 git merge --no-ff $B &&  # M1
 483
 484                 echo C >file &&
 485                 git commit -m C file &&
 486
 487                 git checkout $A &&
 488                 git merge --no-ff HEAD@{1} && # M2
 489
 490                 git checkout main &&
 491                 git merge --no-ff HEAD@{1} &&
 492
 493                 echo "$B main^2^2~1^2" >expect &&
 494                 git name-rev $B >actual &&
 495
 496                 test_cmp expect actual
 497         )
 498 '
 499
 500 # A-B-C-D-E-main
 501 #
 502 # Where C has a non-monotonically increasing commit timestamp w.r.t. other
 503 # commits
 504 test_expect_success 'non-monotonic commit dates setup' '
 505         UNIX_EPOCH_ZERO="@0 +0000" &&
 506         git init non-monotonic &&
 507         test_commit -C non-monotonic A &&
 508         test_commit -C non-monotonic --no-tag B &&
 509         test_commit -C non-monotonic --no-tag --date "$UNIX_EPOCH_ZERO" C &&
 510         test_commit -C non-monotonic D &&
 511         test_commit -C non-monotonic E
 512 '
 513
 514 test_expect_success 'name-rev with commitGraph handles non-monotonic timestamps' '
 515         test_config -C non-monotonic core.commitGraph true &&
 516         (
 517                 cd non-monotonic &&
 518
 519                 git commit-graph write --reachable &&
 520
 521                 echo "main~3 tags/D~2" >expect &&
 522                 git name-rev --tags main~3 >actual &&
 523
 524                 test_cmp expect actual
 525         )
 526 '
 527
 528 test_expect_success 'name-rev --all works with non-monotonic timestamps' '
 529         test_config -C non-monotonic core.commitGraph false &&
 530         (
 531                 cd non-monotonic &&
 532
 533                 rm -rf .git/info/commit-graph* &&
 534
 535                 cat >tags <<-\EOF &&
 536                 tags/E
 537                 tags/D
 538                 tags/D~1
 539                 tags/D~2
 540                 tags/A
 541                 EOF
 542
 543                 git log --pretty=%H >revs &&
 544
 545                 paste -d" " revs tags | sort >expect &&
 546
 547                 git name-rev --tags --all | sort >actual &&
 548                 test_cmp expect actual
 549         )
 550 '
 551
 552 test_expect_success 'name-rev --annotate-stdin works with non-monotonic timestamps' '
 553         test_config -C non-monotonic core.commitGraph false &&
 554         (
 555                 cd non-monotonic &&
 556
 557                 rm -rf .git/info/commit-graph* &&
 558
 559                 cat >expect <<-\EOF &&
 560                 E
 561                 D
 562                 D~1
 563                 D~2
 564                 A
 565                 EOF
 566
 567                 git log --pretty=%H >revs &&
 568                 git name-rev --tags --annotate-stdin --name-only <revs >actual &&
 569                 test_cmp expect actual
 570         )
 571 '
 572
 573 test_expect_success 'name-rev --all works with commitGraph' '
 574         test_config -C non-monotonic core.commitGraph true &&
 575         (
 576                 cd non-monotonic &&
 577
 578                 git commit-graph write --reachable &&
 579
 580                 cat >tags <<-\EOF &&
 581                 tags/E
 582                 tags/D
 583                 tags/D~1
 584                 tags/D~2
 585                 tags/A
 586                 EOF
 587
 588                 git log --pretty=%H >revs &&
 589
 590                 paste -d" " revs tags | sort >expect &&
 591
 592                 git name-rev --tags --all | sort >actual &&
 593                 test_cmp expect actual
 594         )
 595 '
 596
 597 test_expect_success 'name-rev --annotate-stdin works with commitGraph' '
 598         test_config -C non-monotonic core.commitGraph true &&
 599         (
 600                 cd non-monotonic &&
 601
 602                 git commit-graph write --reachable &&
 603
 604                 cat >expect <<-\EOF &&
 605                 E
 606                 D
 607                 D~1
 608                 D~2
 609                 A
 610                 EOF
 611
 612                 git log --pretty=%H >revs &&
 613                 git name-rev --tags --annotate-stdin --name-only <revs >actual &&
 614                 test_cmp expect actual
 615         )
 616 '
 617
 618 #               B
 619 #               o
 620 #                \
 621 #  o-----o---o----x
 622 #        A
 623 #
 624 test_expect_success 'setup: describe commits with disjoint bases' '
 625         git init disjoint1 &&
 626         (
 627                 cd disjoint1 &&
 628
 629                 echo o >> file && git add file && git commit -m o &&
 630                 echo A >> file && git add file && git commit -m A &&
 631                 git tag A -a -m A &&
 632                 echo o >> file && git add file && git commit -m o &&
 633
 634                 git checkout --orphan branch && rm file &&
 635                 echo B > file2 && git add file2 && git commit -m B &&
 636                 git tag B -a -m B &&
 637                 git merge --no-ff --allow-unrelated-histories main -m x
 638         )
 639 '
 640
 641 check_describe -C disjoint1 "A-3-gHASH" HEAD
 642
 643 #           B
 644 #   o---o---o------------.
 645 #                         \
 646 #                  o---o---x
 647 #                  A
 648 #
 649 test_expect_success 'setup: describe commits with disjoint bases 2' '
 650         git init disjoint2 &&
 651         (
 652                 cd disjoint2 &&
 653
 654                 echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A &&
 655                 git tag A -a -m A &&
 656                 echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o &&
 657
 658                 git checkout --orphan branch &&
 659                 echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o &&
 660                 echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
 661                 echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
 662                 git tag B -a -m B &&
 663                 git merge --no-ff --allow-unrelated-histories main -m x
 664         )
 665 '
 666
 667 check_describe -C disjoint2 "B-3-gHASH" HEAD
 668
 669 test_expect_success 'setup misleading taggerdates' '
 670         GIT_COMMITTER_DATE="2006-12-12 12:31" git tag -a -m "another tag" newer-tag-older-commit unique-file~1
 671 '
 672
 673 check_describe newer-tag-older-commit~1 --contains unique-file~2
 674
 675 test_expect_success 'describe --dirty with a file with changed stat' '
 676         test_when_finished "rm -fr stat-dirty" &&
 677         git init stat-dirty &&
 678         (
 679                 cd stat-dirty &&
 680
 681                 echo A >file &&
 682                 git add file &&
 683                 git commit -m A &&
 684                 git tag A -a -m A &&
 685                 echo "A" >expect &&
 686
 687                 test-tool chmtime -10 file &&
 688                 git describe --dirty >actual &&
 689                 test_cmp expect actual
 690         )
 691 '
 692
 693 test_expect_success 'describe --broken --dirty with a file with changed stat' '
 694         test_when_finished "rm -fr stat-dirty" &&
 695         git init stat-dirty &&
 696         (
 697                 cd stat-dirty &&
 698
 699                 echo A >file &&
 700                 git add file &&
 701                 git commit -m A &&
 702                 git tag A -a -m A &&
 703                 echo "A" >expect &&
 704
 705                 test-tool chmtime -10 file &&
 706                 git describe --dirty --broken >actual &&
 707                 test_cmp expect actual
 708         )
 709 '
 710
 711 test_done