summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6938297)
raw | patch | inline | side by side (parent: 6938297)
author | Junio C Hamano <gitster@pobox.com> | |
Tue, 12 Apr 2011 23:48:35 +0000 (16:48 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 13 Apr 2011 22:52:47 +0000 (15:52 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7500-commit.sh | patch | blob | history |
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index bcdf0847d0970f544e96afa0036ec12800422fd8..47096f9014a0f36251eeb643ea302555e9ddc4d5 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
printf "%s" "$(git log --pretty=format:%s%b -1)" >$expect &&
printf "%s" "$1" >$actual &&
- test_cmp $expect $actual
+ test_i18ncmp $expect $actual
}
# A sanity check to see if commit is working at all.
)
'
-test_expect_success C_LOCALE_OUTPUT 'adding real content to a template should commit' '
+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 C_LOCALE_OUTPUT '-t option should be short for --template' '
+test_expect_success '-t option should be short for --template' '
echo "short template" > "$TEMPLATE" &&
echo "new content" >> foo &&
git add foo &&
commit_msg_is "short templatecommit message"
'
-test_expect_success C_LOCALE_OUTPUT 'config-specified template should commit' '
+test_expect_success 'config-specified template should commit' '
echo "new template" > "$TEMPLATE" &&
git config commit.template "$TEMPLATE" &&
echo "more content" >> foo &&
commit_msg_is "squash! edited commit"
'
-test_expect_success C_LOCALE_OUTPUT 'commit --squash works with editor' '
+test_expect_success 'commit --squash works with editor' '
commit_for_rebase_autosquash_setup &&
test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
git commit --squash HEAD~1 &&