You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
166 lines
3.6 KiB
166 lines
3.6 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com> |
|
# |
|
|
|
# FIXME: Test the various index usages, -i and -o, test reflog, |
|
# signoff, hooks |
|
|
|
test_description='git-commit' |
|
. ./test-lib.sh |
|
|
|
test_tick |
|
|
|
test_expect_success \ |
|
"initial status" \ |
|
"echo 'bongo bongo' >file && |
|
git-add file && \ |
|
git-status | grep 'Initial commit'" |
|
|
|
test_expect_failure \ |
|
"fail initial amend" \ |
|
"git-commit --amend" |
|
|
|
test_expect_success \ |
|
"initial commit" \ |
|
"git-commit -m initial" |
|
|
|
test_expect_failure \ |
|
"invalid options 1" \ |
|
"git-commit -m foo -m bar -F file" |
|
|
|
test_expect_failure \ |
|
"invalid options 2" \ |
|
"git-commit -C HEAD -m illegal" |
|
|
|
test_expect_failure \ |
|
"using invalid commit with -C" \ |
|
"git-commit -C bogus" |
|
|
|
test_expect_failure \ |
|
"testing nothing to commit" \ |
|
"git-commit -m initial" |
|
|
|
test_expect_success \ |
|
"next commit" \ |
|
"echo 'bongo bongo bongo' >file \ |
|
git-commit -m next -a" |
|
|
|
test_expect_failure \ |
|
"commit message from non-existing file" \ |
|
"echo 'more bongo: bongo bongo bongo bongo' >file && \ |
|
git-commit -F gah -a" |
|
|
|
# Empty except stray tabs and spaces on a few lines. |
|
sed -e 's/@$//' >msg <<EOF |
|
@ |
|
|
|
@ |
|
Signed-off-by: hula |
|
EOF |
|
test_expect_failure \ |
|
"empty commit message" \ |
|
"git-commit -F msg -a" |
|
|
|
test_expect_success \ |
|
"commit message from file" \ |
|
"echo 'this is the commit message, coming from a file' >msg && \ |
|
git-commit -F msg -a" |
|
|
|
cat >editor <<\EOF |
|
#!/bin/sh |
|
sed -i -e "s/a file/an amend commit/g" $1 |
|
EOF |
|
chmod 755 editor |
|
|
|
test_expect_success \ |
|
"amend commit" \ |
|
"VISUAL=./editor git-commit --amend" |
|
|
|
test_expect_failure \ |
|
"passing -m and -F" \ |
|
"echo 'enough with the bongos' >file && \ |
|
git-commit -F msg -m amending ." |
|
|
|
test_expect_success \ |
|
"using message from other commit" \ |
|
"git-commit -C HEAD^ ." |
|
|
|
cat >editor <<\EOF |
|
#!/bin/sh |
|
sed -i -e "s/amend/older/g" $1 |
|
EOF |
|
chmod 755 editor |
|
|
|
test_expect_success \ |
|
"editing message from other commit" \ |
|
"echo 'hula hula' >file && \ |
|
VISUAL=./editor git-commit -c HEAD^ -a" |
|
|
|
test_expect_success \ |
|
"message from stdin" \ |
|
"echo 'silly new contents' >file && \ |
|
echo commit message from stdin | git-commit -F - -a" |
|
|
|
test_expect_success \ |
|
"overriding author from command line" \ |
|
"echo 'gak' >file && \ |
|
git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a" |
|
|
|
test_expect_success \ |
|
"interactive add" \ |
|
"echo 7 | git-commit --interactive | grep 'What now'" |
|
|
|
test_expect_success \ |
|
"showing committed revisions" \ |
|
"git-rev-list HEAD >current" |
|
|
|
# We could just check the head sha1, but checking each commit makes it |
|
# easier to isolate bugs. |
|
|
|
cat >expected <<\EOF |
|
72c0dc9855b0c9dadcbfd5a31cab072e0cb774ca |
|
9b88fc14ce6b32e3d9ee021531a54f18a5cf38a2 |
|
3536bbb352c3a1ef9a420f5b4242d48578b92aa7 |
|
d381ac431806e53f3dd7ac2f1ae0534f36d738b9 |
|
4fd44095ad6334f3ef72e4c5ec8ddf108174b54a |
|
402702b49136e7587daa9280e91e4bb7cb2179f7 |
|
EOF |
|
|
|
test_expect_success \ |
|
'validate git-rev-list output.' \ |
|
'diff current expected' |
|
|
|
test_expect_success 'partial commit that involves removal (1)' ' |
|
|
|
git rm --cached file && |
|
mv file elif && |
|
git add elif && |
|
git commit -m "Partial: add elif" elif && |
|
git diff-tree --name-status HEAD^ HEAD >current && |
|
echo "A elif" >expected && |
|
diff expected current |
|
|
|
' |
|
|
|
test_expect_success 'partial commit that involves removal (2)' ' |
|
|
|
git commit -m "Partial: remove file" file && |
|
git diff-tree --name-status HEAD^ HEAD >current && |
|
echo "D file" >expected && |
|
diff expected current |
|
|
|
' |
|
|
|
test_expect_success 'partial commit that involves removal (3)' ' |
|
|
|
git rm --cached elif && |
|
echo elif >elif && |
|
git commit -m "Partial: modify elif" elif && |
|
git diff-tree --name-status HEAD^ HEAD >current && |
|
echo "M elif" >expected && |
|
diff expected current |
|
|
|
' |
|
|
|
test_done
|
|
|