t/t7501-commit.sh

   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
   9 test_description='git commit'
  10 . ./test-lib.sh
  11
  12 test_tick
  13
  14 test_expect_success \
  15         "initial status" \
  16         "echo 'bongo bongo' >file &&
  17          git add file && \
  18          git status | grep 'Initial commit'"
  19
  20 test_expect_success \
  21         "fail initial amend" \
  22         "test_must_fail git commit --amend"
  23
  24 test_expect_success \
  25         "initial commit" \
  26         "git commit -m initial"
  27
  28 test_expect_success \
  29         "invalid options 1" \
  30         "test_must_fail git commit -m foo -m bar -F file"
  31
  32 test_expect_success \
  33         "invalid options 2" \
  34         "test_must_fail git commit -C HEAD -m illegal"
  35
  36 test_expect_success \
  37         "using paths with -a" \
  38         "echo King of the bongo >file &&
  39         test_must_fail git commit -m foo -a file"
  40
  41 test_expect_success \
  42         "using paths with --interactive" \
  43         "echo bong-o-bong >file &&
  44         ! (echo 7 | git commit -m foo --interactive file)"
  45
  46 test_expect_success \
  47         "using invalid commit with -C" \
  48         "test_must_fail git commit -C bogus"
  49
  50 test_expect_success \
  51         "testing nothing to commit" \
  52         "test_must_fail git commit -m initial"
  53
  54 test_expect_success \
  55         "next commit" \
  56         "echo 'bongo bongo bongo' >file \
  57          git commit -m next -a"
  58
  59 test_expect_success \
  60         "commit message from non-existing file" \
  61         "echo 'more bongo: bongo bongo bongo bongo' >file && \
  62          test_must_fail git commit -F gah -a"
  63
  64 # Empty except stray tabs and spaces on a few lines.
  65 sed -e 's/@$//' >msg <<EOF
  66                 @
  67
  68   @
  69 Signed-off-by: hula
  70 EOF
  71 test_expect_success \
  72         "empty commit message" \
  73         "test_must_fail git commit -F msg -a"
  74
  75 test_expect_success \
  76         "commit message from file" \
  77         "echo 'this is the commit message, coming from a file' >msg && \
  78          git commit -F msg -a"
  79
  80 cat >editor <<\EOF
  81 #!/bin/sh
  82 sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
  83 mv "$1-" "$1"
  84 EOF
  85 chmod 755 editor
  86
  87 test_expect_success \
  88         "amend commit" \
  89         "VISUAL=./editor git commit --amend"
  90
  91 test_expect_success \
  92         "passing -m and -F" \
  93         "echo 'enough with the bongos' >file && \
  94          test_must_fail git commit -F msg -m amending ."
  95
  96 test_expect_success \
  97         "using message from other commit" \
  98         "git commit -C HEAD^ ."
  99
 100 cat >editor <<\EOF
 101 #!/bin/sh
 102 sed -e "s/amend/older/g"  < "$1" > "$1-"
 103 mv "$1-" "$1"
 104 EOF
 105 chmod 755 editor
 106
 107 test_expect_success \
 108         "editing message from other commit" \
 109         "echo 'hula hula' >file && \
 110          VISUAL=./editor git commit -c HEAD^ -a"
 111
 112 test_expect_success \
 113         "message from stdin" \
 114         "echo 'silly new contents' >file && \
 115          echo commit message from stdin | git commit -F - -a"
 116
 117 test_expect_success \
 118         "overriding author from command line" \
 119         "echo 'gak' >file && \
 120          git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"
 121
 122 echo "SKIP because msysgit does not support Git.pm" ||
 123 test_expect_success \
 124         "interactive add" \
 125         "echo 7 | git commit --interactive | grep 'What now'"
 126
 127 test_expect_success \
 128         "showing committed revisions" \
 129         "git rev-list HEAD >current"
 130
 131 # We could just check the head sha1, but checking each commit makes it
 132 # easier to isolate bugs.
 133
 134 cat >expected <<\EOF
 135 72c0dc9855b0c9dadcbfd5a31cab072e0cb774ca
 136 9b88fc14ce6b32e3d9ee021531a54f18a5cf38a2
 137 3536bbb352c3a1ef9a420f5b4242d48578b92aa7
 138 d381ac431806e53f3dd7ac2f1ae0534f36d738b9
 139 4fd44095ad6334f3ef72e4c5ec8ddf108174b54a
 140 402702b49136e7587daa9280e91e4bb7cb2179f7
 141 EOF
 142
 143 test_expect_success \
 144     'validate git rev-list output.' \
 145     'test_cmp expected current'
 146
 147 test_expect_success 'partial commit that involves removal (1)' '
 148
 149         git rm --cached file &&
 150         mv file elif &&
 151         git add elif &&
 152         git commit -m "Partial: add elif" elif &&
 153         git diff-tree --name-status HEAD^ HEAD >current &&
 154         echo "A elif" >expected &&
 155         test_cmp expected current
 156
 157 '
 158
 159 test_expect_success 'partial commit that involves removal (2)' '
 160
 161         git commit -m "Partial: remove file" file &&
 162         git diff-tree --name-status HEAD^ HEAD >current &&
 163         echo "D file" >expected &&
 164         test_cmp expected current
 165
 166 '
 167
 168 test_expect_success 'partial commit that involves removal (3)' '
 169
 170         git rm --cached elif &&
 171         echo elif >elif &&
 172         git commit -m "Partial: modify elif" elif &&
 173         git diff-tree --name-status HEAD^ HEAD >current &&
 174         echo "M elif" >expected &&
 175         test_cmp expected current
 176
 177 '
 178
 179 author="The Real Author <someguy@his.email.org>"
 180 test_expect_success 'amend commit to fix author' '
 181
 182         oldtick=$GIT_AUTHOR_DATE &&
 183         test_tick &&
 184         git reset --hard &&
 185         git cat-file -p HEAD |
 186         sed -e "s/author.*/author $author $oldtick/" \
 187                 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
 188                 expected &&
 189         git commit --amend --author="$author" &&
 190         git cat-file -p HEAD > current &&
 191         test_cmp expected current
 192
 193 '
 194
 195 test_expect_success 'sign off (1)' '
 196
 197         echo 1 >positive &&
 198         git add positive &&
 199         git commit -s -m "thank you" &&
 200         git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 201         (
 202                 echo thank you
 203                 echo
 204                 git var GIT_COMMITTER_IDENT |
 205                 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
 206         ) >expected &&
 207         test_cmp expected actual
 208
 209 '
 210
 211 test_expect_success 'sign off (2)' '
 212
 213         echo 2 >positive &&
 214         git add positive &&
 215         existing="Signed-off-by: Watch This <watchthis@example.com>" &&
 216         git commit -s -m "thank you
 217
 218 $existing" &&
 219         git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 220         (
 221                 echo thank you
 222                 echo
 223                 echo $existing
 224                 git var GIT_COMMITTER_IDENT |
 225                 sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
 226         ) >expected &&
 227         test_cmp expected actual
 228
 229 '
 230
 231 test_expect_success 'multiple -m' '
 232
 233         >negative &&
 234         git add negative &&
 235         git commit -m "one" -m "two" -m "three" &&
 236         git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 237         (
 238                 echo one
 239                 echo
 240                 echo two
 241                 echo
 242                 echo three
 243         ) >expected &&
 244         test_cmp expected actual
 245
 246 '
 247
 248 author="The Real Author <someguy@his.email.org>"
 249 test_expect_success 'amend commit to fix author' '
 250
 251         oldtick=$GIT_AUTHOR_DATE &&
 252         test_tick &&
 253         git reset --hard &&
 254         git cat-file -p HEAD |
 255         sed -e "s/author.*/author $author $oldtick/" \
 256                 -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
 257                 expected &&
 258         git commit --amend --author="$author" &&
 259         git cat-file -p HEAD > current &&
 260         test_cmp expected current
 261
 262 '
 263
 264 test_expect_success 'git commit <file> with dirty index' '
 265         echo tacocat > elif &&
 266         echo tehlulz > chz &&
 267         git add chz &&
 268         git commit elif -m "tacocat is a palindrome" &&
 269         git show --stat | grep elif &&
 270         git diff --cached | grep chz
 271 '
 272
 273 test_expect_success 'same tree (single parent)' '
 274
 275         git reset --hard
 276
 277         if git commit -m empty
 278         then
 279                 echo oops -- should have complained
 280                 false
 281         else
 282                 : happy
 283         fi
 284
 285 '
 286
 287 test_expect_success 'same tree (single parent) --allow-empty' '
 288
 289         git commit --allow-empty -m "forced empty" &&
 290         git cat-file commit HEAD | grep forced
 291
 292 '
 293
 294 test_expect_success 'same tree (merge and amend merge)' '
 295
 296         git checkout -b side HEAD^ &&
 297         echo zero >zero &&
 298         git add zero &&
 299         git commit -m "add zero" &&
 300         git checkout master &&
 301
 302         git merge -s ours side -m "empty ok" &&
 303         git diff HEAD^ HEAD >actual &&
 304         : >expected &&
 305         test_cmp expected actual &&
 306
 307         git commit --amend -m "empty really ok" &&
 308         git diff HEAD^ HEAD >actual &&
 309         : >expected &&
 310         test_cmp expected actual
 311
 312 '
 313
 314 test_expect_success 'amend using the message from another commit' '
 315
 316         git reset --hard &&
 317         test_tick &&
 318         git commit --allow-empty -m "old commit" &&
 319         old=$(git rev-parse --verify HEAD) &&
 320         test_tick &&
 321         git commit --allow-empty -m "new commit" &&
 322         new=$(git rev-parse --verify HEAD) &&
 323         test_tick &&
 324         git commit --allow-empty --amend -C "$old" &&
 325         git show --pretty="format:%ad %s" "$old" >expected &&
 326         git show --pretty="format:%ad %s" HEAD >actual &&
 327         test_cmp expected actual
 328
 329 '
 330
 331 test_expect_success 'amend using the message from a commit named with tag' '
 332
 333         git reset --hard &&
 334         test_tick &&
 335         git commit --allow-empty -m "old commit" &&
 336         old=$(git rev-parse --verify HEAD) &&
 337         git tag -a -m "tag on old" tagged-old HEAD &&
 338         test_tick &&
 339         git commit --allow-empty -m "new commit" &&
 340         new=$(git rev-parse --verify HEAD) &&
 341         test_tick &&
 342         git commit --allow-empty --amend -C tagged-old &&
 343         git show --pretty="format:%ad %s" "$old" >expected &&
 344         git show --pretty="format:%ad %s" HEAD >actual &&
 345         test_cmp expected actual
 346
 347 '
 348
 349 test_done