t / t6120-describe.shon commit checkout -m path: fix recreating conflicts (6d6f9ac)
   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   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        test_tick &&
  38        echo two >file && git add file && git commit -m second &&
  39        two=$(git rev-parse HEAD) &&
  40
  41        test_tick &&
  42        echo three >file && git add file && git commit -m third &&
  43
  44        test_tick &&
  45        echo A >file && git add file && git commit -m A &&
  46        test_tick &&
  47        git tag -a -m A A &&
  48
  49        test_tick &&
  50        echo c >file && git add file && git commit -m c &&
  51        test_tick &&
  52        git tag c &&
  53
  54        git reset --hard $two &&
  55        test_tick &&
  56        echo B >side && git add side && git commit -m B &&
  57        test_tick &&
  58        git tag -a -m B B &&
  59
  60        test_tick &&
  61        git merge -m Merged c &&
  62        merged=$(git rev-parse HEAD) &&
  63
  64        git reset --hard $two &&
  65        test_tick &&
  66        echo D >another && git add another && git commit -m D &&
  67        test_tick &&
  68        git tag -a -m D D &&
  69
  70        test_tick &&
  71        echo DD >another && git commit -a -m another &&
  72
  73        test_tick &&
  74        git tag e &&
  75
  76        test_tick &&
  77        echo DDD >another && git commit -a -m "yet another" &&
  78
  79        test_tick &&
  80        git merge -m Merged $merged &&
  81
  82        test_tick &&
  83        echo X >file && echo X >side && git add file side &&
  84        git commit -m x
  85
  86'
  87
  88check_describe A-* HEAD
  89check_describe A-* HEAD^
  90check_describe D-* HEAD^^
  91check_describe A-* HEAD^^2
  92check_describe B HEAD^^2^
  93
  94check_describe c-* --tags HEAD
  95check_describe c-* --tags HEAD^
  96check_describe e-* --tags HEAD^^
  97check_describe c-* --tags HEAD^^2
  98check_describe B --tags HEAD^^2^
  99
 100check_describe B-0-* --long HEAD^^2^
 101check_describe A-3-* --long HEAD^^2
 102
 103test_expect_success 'rename tag A to Q locally' '
 104        mv .git/refs/tags/A .git/refs/tags/Q
 105'
 106cat - >err.expect <<EOF
 107warning: tag 'A' is really 'Q' here
 108EOF
 109check_describe A-* HEAD
 110test_expect_success 'warning was displayed for Q' '
 111        test_cmp err.expect err.actual
 112'
 113test_expect_success 'rename tag Q back to A' '
 114        mv .git/refs/tags/Q .git/refs/tags/A
 115'
 116
 117test_expect_success 'pack tag refs' 'git pack-refs'
 118check_describe A-* HEAD
 119
 120test_expect_success 'set-up matching pattern tests' '
 121        git tag -a -m test-annotated test-annotated &&
 122        echo >>file &&
 123        test_tick &&
 124        git commit -a -m "one more" &&
 125        git tag test1-lightweight &&
 126        echo >>file &&
 127        test_tick &&
 128        git commit -a -m "yet another" &&
 129        git tag test2-lightweight &&
 130        echo >>file &&
 131        test_tick &&
 132        git commit -a -m "even more"
 133
 134'
 135
 136check_describe "test-annotated-*" --match="test-*"
 137
 138check_describe "test1-lightweight-*" --tags --match="test1-*"
 139
 140check_describe "test2-lightweight-*" --tags --match="test2-*"
 141
 142check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
 143
 144test_done