From: Tay Ray Chuan Date: Mon, 24 May 2010 09:47:31 GMT Subject: [PATCH 2/3] t7502-commit: add summary output tests for empty and merge commits Message-ID: <1274694452-4200-3-git-send-email-rctay89@gmail.com> In-Reply-To: <1274694452-4200-2-git-send-email-rctay89@gmail.com> After c197702 (pretty: Respect --abbrev option), non-abbreviated hashes began to appear, leading to failures for these tests. Signed-off-by: Tay Ray Chuan --- 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 589e8e6..8a4a277 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: [] +# Arguments: [] [] check_summary_oneline() { test_tick && - git commit -m "$2" | head -1 > act && + echo "$3" | xargs git commit -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" +' + test_expect_success 'the basics' ' # this is needed for the "partial removal" test to pass -- 1.7.1.189.g07419