| #!/bin/sh | |
| # | |
| # Copyright (c) 2007 Steven Grimm | |
| # | |
| test_description='git commit | |
| Tests for selected commit options.' | |
| . ./test-lib.sh | |
| commit_msg_is () { | |
| test "`git log --pretty=format:%s%b -1`" = "$1" | |
| } | |
| # A sanity check to see if commit is working at all. | |
| test_expect_success 'a basic commit in an empty tree should succeed' ' | |
| echo content > foo && | |
| git add foo && | |
| git commit -m "initial commit" | |
| ' | |
| test_expect_success 'nonexistent template file should return error' ' | |
| echo changes >> foo && | |
| git add foo && | |
| test_must_fail git commit --template "$PWD"/notexist | |
| ' | |
| test_expect_success 'nonexistent template file in config should return error' ' | |
| git config commit.template "$PWD"/notexist && | |
| test_must_fail git commit && | |
| git config --unset commit.template | |
| ' | |
| # From now on we'll use a template file that exists. | |
| TEMPLATE="$PWD"/template | |
| test_expect_success 'unedited template should not commit' ' | |
| echo "template line" > "$TEMPLATE" && | |
| test_must_fail git commit --template "$TEMPLATE" | |
| ' | |
| test_expect_success 'unedited template with comments should not commit' ' | |
| echo "# comment in template" >> "$TEMPLATE" && | |
| test_must_fail git commit --template "$TEMPLATE" | |
| ' | |
| test_expect_success 'a Signed-off-by line by itself should not commit' ' | |
| ( | |
| test_set_editor "$TEST_DIRECTORY"/t7500/add-signed-off && | |
| test_must_fail git commit --template "$TEMPLATE" | |
| ) | |
| ' | |
| test_expect_success 'adding comments to a template should not commit' ' | |
| ( | |
| test_set_editor "$TEST_DIRECTORY"/t7500/add-comments && | |
| test_must_fail git commit --template "$TEMPLATE" | |
| ) | |
| ' | |
| test_expect_success 'adding real content to a template should commit' ' | |
| ( | |
| test_set_editor "$TEST_DIRECTORY"/t7500/add-content && | |
| git commit --template "$TEMPLATE" | |
| ) && | |
| commit_msg_is "template linecommit message" | |
| ' | |
| test_expect_success '-t option should be short for --template' ' | |
| echo "short template" > "$TEMPLATE" && | |
| echo "new content" >> foo && | |
| git add foo && | |
| ( | |
| test_set_editor "$TEST_DIRECTORY"/t7500/add-content && | |
| git commit -t "$TEMPLATE" | |
| ) && | |
| commit_msg_is "short templatecommit message" | |
| ' | |
| test_expect_success 'config-specified template should commit' ' | |
| echo "new template" > "$TEMPLATE" && | |
| git config commit.template "$TEMPLATE" && | |
| echo "more content" >> foo && | |
| git add foo && | |
| ( | |
| test_set_editor "$TEST_DIRECTORY"/t7500/add-content && | |
| git commit | |
| ) && | |
| git config --unset commit.template && | |
| commit_msg_is "new templatecommit message" | |
| ' | |
| test_expect_success 'explicit commit message should override template' ' | |
| echo "still more content" >> foo && | |
| git add foo && | |
| GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-content git commit --template "$TEMPLATE" \ | |
| -m "command line msg" && | |
| commit_msg_is "command line msg" | |
| ' | |
| test_expect_success 'commit message from file should override template' ' | |
| echo "content galore" >> foo && | |
| git add foo && | |
| echo "standard input msg" | | |
| ( | |
| test_set_editor "$TEST_DIRECTORY"/t7500/add-content && | |
| git commit --template "$TEMPLATE" --file - | |
| ) && | |
| commit_msg_is "standard input msg" | |
| ' | |
| test_expect_success 'using alternate GIT_INDEX_FILE (1)' ' | |
| cp .git/index saved-index && | |
| ( | |
| echo some new content >file && | |
| GIT_INDEX_FILE=.git/another_index && | |
| export GIT_INDEX_FILE && | |
| git add file && | |
| git commit -m "commit using another index" && | |
| git diff-index --exit-code HEAD && | |
| git diff-files --exit-code | |
| ) && | |
| cmp .git/index saved-index >/dev/null | |
| ' | |
| test_expect_success 'using alternate GIT_INDEX_FILE (2)' ' | |
| cp .git/index saved-index && | |
| ( | |
| rm -f .git/no-such-index && | |
| GIT_INDEX_FILE=.git/no-such-index && | |
| export GIT_INDEX_FILE && | |
| git commit -m "commit using nonexistent index" && | |
| test -z "$(git ls-files)" && | |
| test -z "$(git ls-tree HEAD)" | |
| ) && | |
| cmp .git/index saved-index >/dev/null | |
| ' | |
| cat > expect << EOF | |
| zort | |
| Signed-off-by: C O Mitter <committer@example.com> | |
| EOF | |
| test_expect_success '--signoff' ' | |
| echo "yet another content *narf*" >> foo && | |
| echo "zort" | git commit -s -F - foo && | |
| git cat-file commit HEAD | sed "1,/^$/d" > output && | |
| test_cmp expect output | |
| ' | |
| test_expect_success 'commit message from file (1)' ' | |
| mkdir subdir && | |
| echo "Log in top directory" >log && | |
| echo "Log in sub directory" >subdir/log && | |
| ( | |
| cd subdir && | |
| git commit --allow-empty -F log | |
| ) && | |
| commit_msg_is "Log in sub directory" | |
| ' | |
| test_expect_success 'commit message from file (2)' ' | |
| rm -f log && | |
| echo "Log in sub directory" >subdir/log && | |
| ( | |
| cd subdir && | |
| git commit --allow-empty -F log | |
| ) && | |
| commit_msg_is "Log in sub directory" | |
| ' | |
| test_expect_success 'commit message from stdin' ' | |
| ( | |
| cd subdir && | |
| echo "Log with foo word" | git commit --allow-empty -F - | |
| ) && | |
| commit_msg_is "Log with foo word" | |
| ' | |
| test_done |