undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7502-commit: add summary output tests for empty and merge commits

Browse Source 
After c197702 (pretty: Respect --abbrev option), non-abbreviated hashes
began to appear, leading to failures for these tests.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2010-05-27 23:34:51 +08:00 committed by Junio C Hamano
parent fc6fa0d0f3
commit cee9f2b37b
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
t/t7502-commit.sh
View File

@ -4,10 +4,10 @@ test_description='git commit porcelain-ish'
. ./test-lib.sh . ./test-lib.sh
# Arguments: [<prefix] [<commit message>] # Arguments: [<prefix] [<commit message>] [<commit options>]
check_summary_oneline() { check_summary_oneline() {
test_tick && test_tick &&
git commit -m "$2" | head -1 > act && git commit ${3+"$3"} -m "$2" | head -1 > act &&
# branch name # branch name
SUMMARY_PREFIX="$(git name-rev --name-only HEAD)" && SUMMARY_PREFIX="$(git name-rev --name-only HEAD)" &&
@ -36,6 +36,31 @@ test_expect_success 'output summary format' '
check_summary_oneline "" "a change" check_summary_oneline "" "a change"
' '
test_expect_failure 'output summary format for commit with an empty diff' '
check_summary_oneline "" "empty" "--allow-empty"
'
test_expect_failure 'output summary format for merges' '
git checkout -b recursive-base &&
test_commit base file1 &&
git checkout -b recursive-a recursive-base &&
test_commit commit-a file1 &&
git checkout -b recursive-b recursive-base &&
test_commit commit-b file1 &&
# conflict
git checkout recursive-a &&
test_must_fail git merge recursive-b &&
# resolve the conflict
echo commit-a > file1 &&
git add file1 &&
check_summary_oneline "" "Merge"
'
output_tests_cleanup() { output_tests_cleanup() {
# this is needed for "do not fire editor in the presence of conflicts" # this is needed for "do not fire editor in the presence of conflicts"
git checkout master && git checkout master &&