t / t6030-bisect-porcelain.shon commit bisect: fix left over "BISECT_START" file when starting with junk rev (9d0cd91)
   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Christian Couder
   4#
   5test_description='Tests git-bisect functionality'
   6
   7exec </dev/null
   8
   9. ./test-lib.sh
  10
  11add_line_into_file()
  12{
  13    _line=$1
  14    _file=$2
  15
  16    if [ -f "$_file" ]; then
  17        echo "$_line" >> $_file || return $?
  18        MSG="Add <$_line> into <$_file>."
  19    else
  20        echo "$_line" > $_file || return $?
  21        git add $_file || return $?
  22        MSG="Create file <$_file> with <$_line> inside."
  23    fi
  24
  25    test_tick
  26    git-commit --quiet -m "$MSG" $_file
  27}
  28
  29HASH1=
  30HASH2=
  31HASH3=
  32HASH4=
  33
  34test_expect_success 'set up basic repo with 1 file (hello) and 4 commits' '
  35     add_line_into_file "1: Hello World" hello &&
  36     HASH1=$(git rev-parse --verify HEAD) &&
  37     add_line_into_file "2: A new day for git" hello &&
  38     HASH2=$(git rev-parse --verify HEAD) &&
  39     add_line_into_file "3: Another new day for git" hello &&
  40     HASH3=$(git rev-parse --verify HEAD) &&
  41     add_line_into_file "4: Ciao for now" hello &&
  42     HASH4=$(git rev-parse --verify HEAD)
  43'
  44
  45test_expect_success 'bisect starts with only one bad' '
  46        git bisect reset &&
  47        git bisect start &&
  48        git bisect bad $HASH4 &&
  49        git bisect next
  50'
  51
  52test_expect_success 'bisect does not start with only one good' '
  53        git bisect reset &&
  54        git bisect start &&
  55        git bisect good $HASH1 || return 1
  56
  57        if git bisect next
  58        then
  59                echo Oops, should have failed.
  60                false
  61        else
  62                :
  63        fi
  64'
  65
  66test_expect_success 'bisect start with one bad and good' '
  67        git bisect reset &&
  68        git bisect start &&
  69        git bisect good $HASH1 &&
  70        git bisect bad $HASH4 &&
  71        git bisect next
  72'
  73
  74test_expect_success 'bisect fails if given any junk instead of revs' '
  75        git bisect reset &&
  76        test_must_fail git bisect start foo $HASH1 -- &&
  77        test_must_fail git bisect start $HASH4 $HASH1 bar -- &&
  78        test -z "$(git for-each-ref "refs/bisect/*")" &&
  79        test_must_fail ls .git/BISECT_* &&
  80        git bisect start &&
  81        test_must_fail git bisect good foo $HASH1 &&
  82        test_must_fail git bisect good $HASH1 bar &&
  83        test_must_fail git bisect bad frotz &&
  84        test_must_fail git bisect bad $HASH3 $HASH4 &&
  85        test_must_fail git bisect skip bar $HASH3 &&
  86        test_must_fail git bisect skip $HASH1 foo &&
  87        test -z "$(git for-each-ref "refs/bisect/*")" &&
  88        git bisect good $HASH1 &&
  89        git bisect bad $HASH4
  90'
  91
  92test_expect_success 'bisect reset: back in the master branch' '
  93        git bisect reset &&
  94        echo "* master" > branch.expect &&
  95        git branch > branch.output &&
  96        cmp branch.expect branch.output
  97'
  98
  99test_expect_success 'bisect reset: back in another branch' '
 100        git checkout -b other &&
 101        git bisect start &&
 102        git bisect good $HASH1 &&
 103        git bisect bad $HASH3 &&
 104        git bisect reset &&
 105        echo "  master" > branch.expect &&
 106        echo "* other" >> branch.expect &&
 107        git branch > branch.output &&
 108        cmp branch.expect branch.output
 109'
 110
 111test_expect_success 'bisect reset when not bisecting' '
 112        git bisect reset &&
 113        git branch > branch.output &&
 114        cmp branch.expect branch.output
 115'
 116
 117test_expect_success 'bisect reset removes packed refs' '
 118        git bisect reset &&
 119        git bisect start &&
 120        git bisect good $HASH1 &&
 121        git bisect bad $HASH3 &&
 122        git pack-refs --all --prune &&
 123        git bisect next &&
 124        git bisect reset &&
 125        test -z "$(git for-each-ref "refs/bisect/*")" &&
 126        test -z "$(git for-each-ref "refs/heads/bisect")"
 127'
 128
 129test_expect_success 'bisect start: back in good branch' '
 130        git branch > branch.output &&
 131        grep "* other" branch.output > /dev/null &&
 132        git bisect start $HASH4 $HASH1 -- &&
 133        git bisect good &&
 134        git bisect start $HASH4 $HASH1 -- &&
 135        git bisect bad &&
 136        git bisect reset &&
 137        git branch > branch.output &&
 138        grep "* other" branch.output > /dev/null
 139'
 140
 141test_expect_success 'bisect start: no ".git/BISECT_START" if junk rev' '
 142        git bisect start $HASH4 $HASH1 -- &&
 143        git bisect good &&
 144        test_must_fail git bisect start $HASH4 foo -- &&
 145        git branch > branch.output &&
 146        grep "* other" branch.output > /dev/null &&
 147        test_must_fail test -e .git/BISECT_START
 148'
 149
 150test_expect_failure 'bisect start: no ".git/BISECT_START" if mistaken rev' '
 151        git bisect start $HASH4 $HASH1 -- &&
 152        git bisect good &&
 153        test_must_fail git bisect start $HASH1 $HASH4 -- &&
 154        git branch > branch.output &&
 155        grep "* other" branch.output > /dev/null &&
 156        test_must_fail test -e .git/BISECT_START
 157'
 158
 159test_expect_failure 'bisect start: no ".git/BISECT_START" if checkout error' '
 160        echo "temp stuff" > hello &&
 161        test_must_fail git bisect start $HASH4 $HASH1 -- &&
 162        git branch &&
 163        git branch > branch.output &&
 164        grep "* other" branch.output > /dev/null &&
 165        test_must_fail test -e .git/BISECT_START &&
 166        test -z "$(git for-each-ref "refs/bisect/*")"
 167'
 168
 169# This cleanup is needed whatever the result of the above test.
 170git checkout HEAD hello
 171
 172# $HASH1 is good, $HASH4 is bad, we skip $HASH3
 173# but $HASH2 is bad,
 174# so we should find $HASH2 as the first bad commit
 175test_expect_success 'bisect skip: successfull result' '
 176        git bisect reset &&
 177        git bisect start $HASH4 $HASH1 &&
 178        git bisect skip &&
 179        git bisect bad > my_bisect_log.txt &&
 180        grep "$HASH2 is first bad commit" my_bisect_log.txt &&
 181        git bisect reset
 182'
 183
 184# $HASH1 is good, $HASH4 is bad, we skip $HASH3 and $HASH2
 185# so we should not be able to tell the first bad commit
 186# among $HASH2, $HASH3 and $HASH4
 187test_expect_success 'bisect skip: cannot tell between 3 commits' '
 188        git bisect start $HASH4 $HASH1 &&
 189        git bisect skip || return 1
 190
 191        if git bisect skip > my_bisect_log.txt
 192        then
 193                echo Oops, should have failed.
 194                false
 195        else
 196                test $? -eq 2 &&
 197                grep "first bad commit could be any of" my_bisect_log.txt &&
 198                ! grep $HASH1 my_bisect_log.txt &&
 199                grep $HASH2 my_bisect_log.txt &&
 200                grep $HASH3 my_bisect_log.txt &&
 201                grep $HASH4 my_bisect_log.txt &&
 202                git bisect reset
 203        fi
 204'
 205
 206# $HASH1 is good, $HASH4 is bad, we skip $HASH3
 207# but $HASH2 is good,
 208# so we should not be able to tell the first bad commit
 209# among $HASH3 and $HASH4
 210test_expect_success 'bisect skip: cannot tell between 2 commits' '
 211        git bisect start $HASH4 $HASH1 &&
 212        git bisect skip || return 1
 213
 214        if git bisect good > my_bisect_log.txt
 215        then
 216                echo Oops, should have failed.
 217                false
 218        else
 219                test $? -eq 2 &&
 220                grep "first bad commit could be any of" my_bisect_log.txt &&
 221                ! grep $HASH1 my_bisect_log.txt &&
 222                ! grep $HASH2 my_bisect_log.txt &&
 223                grep $HASH3 my_bisect_log.txt &&
 224                grep $HASH4 my_bisect_log.txt &&
 225                git bisect reset
 226        fi
 227'
 228
 229# We want to automatically find the commit that
 230# introduced "Another" into hello.
 231test_expect_success \
 232    '"git bisect run" simple case' \
 233    'echo "#"\!"/bin/sh" > test_script.sh &&
 234     echo "grep Another hello > /dev/null" >> test_script.sh &&
 235     echo "test \$? -ne 0" >> test_script.sh &&
 236     chmod +x test_script.sh &&
 237     git bisect start &&
 238     git bisect good $HASH1 &&
 239     git bisect bad $HASH4 &&
 240     git bisect run ./test_script.sh > my_bisect_log.txt &&
 241     grep "$HASH3 is first bad commit" my_bisect_log.txt &&
 242     git bisect reset'
 243
 244# We want to automatically find the commit that
 245# introduced "Ciao" into hello.
 246test_expect_success \
 247    '"git bisect run" with more complex "git bisect start"' \
 248    'echo "#"\!"/bin/sh" > test_script.sh &&
 249     echo "grep Ciao hello > /dev/null" >> test_script.sh &&
 250     echo "test \$? -ne 0" >> test_script.sh &&
 251     chmod +x test_script.sh &&
 252     git bisect start $HASH4 $HASH1 &&
 253     git bisect run ./test_script.sh > my_bisect_log.txt &&
 254     grep "$HASH4 is first bad commit" my_bisect_log.txt &&
 255     git bisect reset'
 256
 257# $HASH1 is good, $HASH5 is bad, we skip $HASH3
 258# but $HASH4 is good,
 259# so we should find $HASH5 as the first bad commit
 260HASH5=
 261test_expect_success 'bisect skip: add line and then a new test' '
 262        add_line_into_file "5: Another new line." hello &&
 263        HASH5=$(git rev-parse --verify HEAD) &&
 264        git bisect start $HASH5 $HASH1 &&
 265        git bisect skip &&
 266        git bisect good > my_bisect_log.txt &&
 267        grep "$HASH5 is first bad commit" my_bisect_log.txt &&
 268        git bisect log > log_to_replay.txt &&
 269        git bisect reset
 270'
 271
 272test_expect_success 'bisect skip and bisect replay' '
 273        git bisect replay log_to_replay.txt > my_bisect_log.txt &&
 274        grep "$HASH5 is first bad commit" my_bisect_log.txt &&
 275        git bisect reset
 276'
 277
 278HASH6=
 279test_expect_success 'bisect run & skip: cannot tell between 2' '
 280        add_line_into_file "6: Yet a line." hello &&
 281        HASH6=$(git rev-parse --verify HEAD) &&
 282        echo "#"\!"/bin/sh" > test_script.sh &&
 283        echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh &&
 284        echo "grep line hello > /dev/null" >> test_script.sh &&
 285        echo "test \$? -ne 0" >> test_script.sh &&
 286        chmod +x test_script.sh &&
 287        git bisect start $HASH6 $HASH1 &&
 288        if git bisect run ./test_script.sh > my_bisect_log.txt
 289        then
 290                echo Oops, should have failed.
 291                false
 292        else
 293                test $? -eq 2 &&
 294                grep "first bad commit could be any of" my_bisect_log.txt &&
 295                ! grep $HASH3 my_bisect_log.txt &&
 296                ! grep $HASH6 my_bisect_log.txt &&
 297                grep $HASH4 my_bisect_log.txt &&
 298                grep $HASH5 my_bisect_log.txt
 299        fi
 300'
 301
 302HASH7=
 303test_expect_success 'bisect run & skip: find first bad' '
 304        git bisect reset &&
 305        add_line_into_file "7: Should be the last line." hello &&
 306        HASH7=$(git rev-parse --verify HEAD) &&
 307        echo "#"\!"/bin/sh" > test_script.sh &&
 308        echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh &&
 309        echo "sed -ne \\\$p hello | grep day > /dev/null && exit 125" >> test_script.sh &&
 310        echo "grep Yet hello > /dev/null" >> test_script.sh &&
 311        echo "test \$? -ne 0" >> test_script.sh &&
 312        chmod +x test_script.sh &&
 313        git bisect start $HASH7 $HASH1 &&
 314        git bisect run ./test_script.sh > my_bisect_log.txt &&
 315        grep "$HASH6 is first bad commit" my_bisect_log.txt
 316'
 317
 318test_expect_success 'bisect starting with a detached HEAD' '
 319
 320        git bisect reset &&
 321        git checkout master^ &&
 322        HEAD=$(git rev-parse --verify HEAD) &&
 323        git bisect start &&
 324        test $HEAD = $(cat .git/BISECT_START) &&
 325        git bisect reset &&
 326        test $HEAD = $(git rev-parse --verify HEAD)
 327
 328'
 329
 330test_expect_success 'bisect refuses to start if branch bisect exists' '
 331        git bisect reset &&
 332        git branch bisect &&
 333        test_must_fail git bisect start &&
 334        git branch -d bisect &&
 335        git checkout -b bisect &&
 336        test_must_fail git bisect start &&
 337        git checkout master &&
 338        git branch -d bisect
 339'
 340
 341test_expect_success 'bisect refuses to start if branch new-bisect exists' '
 342        git bisect reset &&
 343        git branch new-bisect &&
 344        test_must_fail git bisect start &&
 345        git branch -d new-bisect
 346'
 347
 348test_expect_success 'bisect errors out if bad and good are mistaken' '
 349        git bisect reset &&
 350        test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
 351        grep "mistake good and bad" rev_list_error &&
 352        git bisect reset
 353'
 354
 355#
 356#
 357test_done