Andrew's git / gitweb.git /
da75abc1bf9adc8a9528d514ce9813f20303d01f
   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
   4#
   5
   6# FIXME: Test the various index usages, -i and -o, test reflog,
   7# signoff
   8
   9test_description='git commit'
  10. ./test-lib.sh
  11
  12test_tick
  13
  14test_expect_success \
  15        "initial status" \
  16        "echo 'bongo bongo' >file &&
  17         git add file"
  18
  19test_expect_success "Constructing initial commit" '
  20        git status >actual &&
  21        test_i18ngrep "Initial commit" actual
  22'
  23
  24test_expect_success \
  25        "fail initial amend" \
  26        "test_must_fail git commit --amend"
  27
  28test_expect_success \
  29        "initial commit" \
  30        "git commit -m initial"
  31
  32test_expect_success \
  33        "invalid options 1" \
  34        "test_must_fail git commit -m foo -m bar -F file"
  35
  36test_expect_success \
  37        "invalid options 2" \
  38        "test_must_fail git commit -C HEAD -m illegal"
  39
  40test_expect_success \
  41        "using paths with -a" \
  42        "echo King of the bongo >file &&
  43        test_must_fail git commit -m foo -a file"
  44
  45test_expect_success PERL 'can use paths with --interactive' '
  46        echo bong-o-bong >file &&
  47        # 2: update, 1:st path, that is all, 7: quit
  48        ( echo 2; echo 1; echo; echo 7 ) |
  49        git commit -m foo --interactive file &&
  50        git reset --hard HEAD^
  51'
  52
  53test_expect_success \
  54        "using invalid commit with -C" \
  55        "test_must_fail git commit -C bogus"
  56
  57test_expect_success \
  58        "testing nothing to commit" \
  59        "test_must_fail git commit -m initial"
  60
  61test_expect_success \
  62        "next commit" \
  63        "echo 'bongo bongo bongo' >file && \
  64         git commit -m next -a"
  65
  66test_expect_success \
  67        "commit message from non-existing file" \
  68        "echo 'more bongo: bongo bongo bongo bongo' >file && \
  69         test_must_fail git commit -F gah -a"
  70
  71# Empty except stray tabs and spaces on a few lines.
  72sed -e 's/@$//' >msg <<EOF
  73                @
  74
  75  @
  76Signed-off-by: hula
  77EOF
  78test_expect_success \
  79        "empty commit message" \
  80        "test_must_fail git commit -F msg -a"
  81
  82test_expect_success \
  83        "commit message from file" \
  84        "echo 'this is the commit message, coming from a file' >msg && \
  85         git commit -F msg -a"
  86
  87cat >editor <<\EOF
  88#!/bin/sh
  89sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
  90mv "$1-" "$1"
  91EOF
  92chmod 755 editor
  93
  94test_expect_success \
  95        "amend commit" \
  96        "EDITOR=./editor git commit --amend"
  97
  98test_expect_success \
  99        "passing -m and -F" \
 100        "echo 'enough with the bongos' >file && \
 101         test_must_fail git commit -F msg -m amending ."
 102
 103test_expect_success \
 104        "using message from other commit" \
 105        "git commit -C HEAD^ ."
 106
 107cat >editor <<\EOF
 108#!/bin/sh
 109sed -e "s/amend/older/g"  < "$1" > "$1-"
 110mv "$1-" "$1"
 111EOF
 112chmod 755 editor
 113
 114test_expect_success \
 115        "editing message from other commit" \
 116        "echo 'hula hula' >file && \
 117         EDITOR=./editor git commit -c HEAD^ -a"
 118
 119test_expect_success \
 120        "message from stdin" \
 121        "echo 'silly new contents' >file && \
 122         echo commit message from stdin | git commit -F - -a"
 123
 124test_expect_success \
 125        "overriding author from command line" \
 126        "echo 'gak' >file && \
 127         git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a >output 2>&1"
 128
 129test_expect_success \
 130        "commit --author output mentions author" \
 131        "grep Rubber.Duck output"
 132
 133test_expect_success PERL \
 134        "interactive add" \
 135        "echo 7 | git commit --interactive | grep 'What now'"
 136
 137test_expect_success PERL \
 138        "commit --interactive doesn't change index if editor aborts" \
 139        "echo zoo >file &&
 140        test_must_fail git diff --exit-code >diff1 &&
 141        (echo u ; echo '*' ; echo q) |
 142        (EDITOR=: && export EDITOR &&
 143         test_must_fail git commit --interactive) &&
 144        git diff >diff2 &&
 145        test_cmp diff1 diff2"
 146
 147test_expect_success \
 148        "showing committed revisions" \
 149        "git rev-list HEAD >current"
 150
 151cat >editor <<\EOF
 152#!/bin/sh
 153sed -e "s/good/bad/g" < "$1" > "$1-"
 154mv "$1-" "$1"
 155EOF
 156chmod 755 editor
 157
 158cat >msg <<EOF
 159A good commit message.
 160EOF
 161
 162test_expect_success \
 163        'editor not invoked if -F is given' '
 164         echo "moo" >file &&
 165         EDITOR=./editor git commit -a -F msg &&
 166         git show -s --pretty=format:"%s" | grep -q good &&
 167         echo "quack" >file &&
 168         echo "Another good message." | EDITOR=./editor git commit -a -F - &&
 169         git show -s --pretty=format:"%s" | grep -q good
 170         '
 171# We could just check the head sha1, but checking each commit makes it
 172# easier to isolate bugs.
 173
 174cat >expected <<\EOF
 175285fcf7ec0d61b14249dfdb4c1e1fe03eaf15ee0
 1760b8148b9afce917b87d71199b900466dc8ea8b6e
 17743fb8826314939ce79a856face7953557fdca3d1
 178eaa04bc3ae0f0b003f7f1d86bf869ec5d73eaf3e
 179ee1963b250ee0f02a3fe37be0e4a02bb5af6a1ad
 180b49f306003c627361a0304d151a6b4c8b26af6a1
 181402702b49136e7587daa9280e91e4bb7cb2179f7
 182EOF
 183
 184test_expect_success \
 185    'validate git rev-list output.' \
 186    'test_cmp expected current'
 187
 188test_expect_success 'partial commit that involves removal (1)' '
 189
 190        git rm --cached file &&
 191        mv file elif &&
 192        git add elif &&
 193        git commit -m "Partial: add elif" elif &&
 194        git diff-tree --name-status HEAD^ HEAD >current &&
 195        echo "A elif" >expected &&
 196        test_cmp expected current
 197
 198'
 199
 200test_expect_success 'partial commit that involves removal (2)' '
 201
 202        git commit -m "Partial: remove file" file &&
 203        git diff-tree --name-status HEAD^ HEAD >current &&
 204        echo "D file" >expected &&
 205        test_cmp expected current
 206
 207'
 208
 209test_expect_success 'partial commit that involves removal (3)' '
 210
 211        git rm --cached elif &&
 212        echo elif >elif &&
 213        git commit -m "Partial: modify elif" elif &&
 214        git diff-tree --name-status HEAD^ HEAD >current &&
 215        echo "M elif" >expected &&
 216        test_cmp expected current
 217
 218'
 219
 220author="The Real Author <someguy@his.email.org>"
 221test_expect_success 'amend commit to fix author' '
 222
 223        oldtick=$GIT_AUTHOR_DATE &&
 224        test_tick &&
 225        git reset --hard &&
 226        git cat-file -p HEAD |
 227        sed -e "s/author.*/author $author $oldtick/" \
 228                -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
 229                expected &&
 230        git commit --amend --author="$author" &&
 231        git cat-file -p HEAD > current &&
 232        test_cmp expected current
 233
 234'
 235
 236test_expect_success 'amend commit to fix date' '
 237
 238        test_tick &&
 239        newtick=$GIT_AUTHOR_DATE &&
 240        git reset --hard &&
 241        git cat-file -p HEAD |
 242        sed -e "s/author.*/author $author $newtick/" \
 243                -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
 244                expected &&
 245        git commit --amend --date="$newtick" &&
 246        git cat-file -p HEAD > current &&
 247        test_cmp expected current
 248
 249'
 250
 251test_expect_success 'commit complains about bogus date' '
 252        test_must_fail git commit --amend --date=10.11.2010
 253'
 254
 255test_expect_success 'sign off (1)' '
 256
 257        echo 1 >positive &&
 258        git add positive &&
 259        git commit -s -m "thank you" &&
 260        git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 261        (
 262                echo thank you
 263                echo
 264                git var GIT_COMMITTER_IDENT |
 265                sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
 266        ) >expected &&
 267        test_cmp expected actual
 268
 269'
 270
 271test_expect_success 'sign off (2)' '
 272
 273        echo 2 >positive &&
 274        git add positive &&
 275        existing="Signed-off-by: Watch This <watchthis@example.com>" &&
 276        git commit -s -m "thank you
 277
 278$existing" &&
 279        git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 280        (
 281                echo thank you
 282                echo
 283                echo $existing
 284                git var GIT_COMMITTER_IDENT |
 285                sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
 286        ) >expected &&
 287        test_cmp expected actual
 288
 289'
 290
 291test_expect_success 'signoff gap' '
 292
 293        echo 3 >positive &&
 294        git add positive &&
 295        alt="Alt-RFC-822-Header: Value" &&
 296        git commit -s -m "welcome
 297
 298$alt" &&
 299        git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
 300        (
 301                echo welcome
 302                echo
 303                echo $alt
 304                git var GIT_COMMITTER_IDENT |
 305                sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
 306        ) >expected &&
 307        test_cmp expected actual
 308'
 309
 310test_expect_success 'signoff gap 2' '
 311
 312        echo 4 >positive &&
 313        git add positive &&
 314        alt="fixed: 34" &&
 315        git commit -s -m "welcome
 316
 317We have now
 318$alt" &&
 319        git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
 320        (
 321                echo welcome
 322                echo
 323                echo We have now
 324                echo $alt
 325                echo
 326                git var GIT_COMMITTER_IDENT |
 327                sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
 328        ) >expected &&
 329        test_cmp expected actual
 330'
 331
 332test_expect_success 'multiple -m' '
 333
 334        >negative &&
 335        git add negative &&
 336        git commit -m "one" -m "two" -m "three" &&
 337        git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 338        (
 339                echo one
 340                echo
 341                echo two
 342                echo
 343                echo three
 344        ) >expected &&
 345        test_cmp expected actual
 346
 347'
 348
 349author="The Real Author <someguy@his.email.org>"
 350test_expect_success 'amend commit to fix author' '
 351
 352        oldtick=$GIT_AUTHOR_DATE &&
 353        test_tick &&
 354        git reset --hard &&
 355        git cat-file -p HEAD |
 356        sed -e "s/author.*/author $author $oldtick/" \
 357                -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
 358                expected &&
 359        git commit --amend --author="$author" &&
 360        git cat-file -p HEAD > current &&
 361        test_cmp expected current
 362
 363'
 364
 365test_expect_success 'git commit <file> with dirty index' '
 366        echo tacocat > elif &&
 367        echo tehlulz > chz &&
 368        git add chz &&
 369        git commit elif -m "tacocat is a palindrome" &&
 370        git show --stat | grep elif &&
 371        git diff --cached | grep chz
 372'
 373
 374test_expect_success 'same tree (single parent)' '
 375
 376        git reset --hard
 377
 378        if git commit -m empty
 379        then
 380                echo oops -- should have complained
 381                false
 382        else
 383                : happy
 384        fi
 385
 386'
 387
 388test_expect_success 'same tree (single parent) --allow-empty' '
 389
 390        git commit --allow-empty -m "forced empty" &&
 391        git cat-file commit HEAD | grep forced
 392
 393'
 394
 395test_expect_success 'same tree (merge and amend merge)' '
 396
 397        git checkout -b side HEAD^ &&
 398        echo zero >zero &&
 399        git add zero &&
 400        git commit -m "add zero" &&
 401        git checkout master &&
 402
 403        git merge -s ours side -m "empty ok" &&
 404        git diff HEAD^ HEAD >actual &&
 405        : >expected &&
 406        test_cmp expected actual &&
 407
 408        git commit --amend -m "empty really ok" &&
 409        git diff HEAD^ HEAD >actual &&
 410        : >expected &&
 411        test_cmp expected actual
 412
 413'
 414
 415test_expect_success 'amend using the message from another commit' '
 416
 417        git reset --hard &&
 418        test_tick &&
 419        git commit --allow-empty -m "old commit" &&
 420        old=$(git rev-parse --verify HEAD) &&
 421        test_tick &&
 422        git commit --allow-empty -m "new commit" &&
 423        new=$(git rev-parse --verify HEAD) &&
 424        test_tick &&
 425        git commit --allow-empty --amend -C "$old" &&
 426        git show --pretty="format:%ad %s" "$old" >expected &&
 427        git show --pretty="format:%ad %s" HEAD >actual &&
 428        test_cmp expected actual
 429
 430'
 431
 432test_expect_success 'amend using the message from a commit named with tag' '
 433
 434        git reset --hard &&
 435        test_tick &&
 436        git commit --allow-empty -m "old commit" &&
 437        old=$(git rev-parse --verify HEAD) &&
 438        git tag -a -m "tag on old" tagged-old HEAD &&
 439        test_tick &&
 440        git commit --allow-empty -m "new commit" &&
 441        new=$(git rev-parse --verify HEAD) &&
 442        test_tick &&
 443        git commit --allow-empty --amend -C tagged-old &&
 444        git show --pretty="format:%ad %s" "$old" >expected &&
 445        git show --pretty="format:%ad %s" HEAD >actual &&
 446        test_cmp expected actual
 447
 448'
 449
 450test_expect_success 'amend can copy notes' '
 451
 452        git config notes.rewrite.amend true &&
 453        git config notes.rewriteRef "refs/notes/*" &&
 454        test_commit foo &&
 455        git notes add -m"a note" &&
 456        test_tick &&
 457        git commit --amend -m"new foo" &&
 458        test "$(git notes show)" = "a note"
 459
 460'
 461
 462test_done