[PATCH v2 2/3] t7502-commit: add summary output tests for empty and merge commits
From: Tay Ray Chuan <hidden>
Date: 2016-06-15 22:48:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
After c197702 (pretty: Respect --abbrev option), non-abbreviated hashes began to appear, leading to failures for these tests. Signed-off-by: Tay Ray Chuan <redacted> --- Changes from v1: - changed shell syntax in check_summary_oneline(), based on Junio's suggestion. t/t7502-commit.sh | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 478b637..b10541d 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh@@ -4,10 +4,10 @@ test_description='git commit porcelain-ish' . ./test-lib.sh -# Arguments: [<prefix] [<commit message>] +# Arguments: [<prefix] [<commit message>] [<commit options>] check_summary_oneline() { test_tick && - git commit -m "$2" | head -1 > act && + git commit ${3+"$3"} -m "$2" | head -1 > act && # branch name SUMMARY_PREFIX="$(git name-rev --name-only HEAD)" &&
@@ -36,6 +36,31 @@ test_expect_success 'output summary format' ' 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() { # this is needed for "do not fire editor in the presence of conflicts" git checkout master && --
1.7.1.189.g07419