summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-28 13:17:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-28 13:17:57 -0700
commit14793a4e37341950dc338ea7a7dbc05db37f5e9e (patch)
treecd73967a9ac8456214b594290f18b4c8fc7cec99 /t
parentMerge branch 'dl/packet-read-response-end-fix' (diff)
parentcommit: remove irrelavent prompt on `--allow-empty-message` (diff)
downloadtgif-14793a4e37341950dc338ea7a7dbc05db37f5e9e.tar.xz
Merge branch 'hj/commit-allow-empty-message'
"git commit --allow-empty-message" won't abort the operation upon an empty message, but the hint shown in the editor said otherwise. * hj/commit-allow-empty-message: commit: remove irrelavent prompt on `--allow-empty-message` commit: reorganise commit hint strings
Diffstat (limited to 't')
-rwxr-xr-xt/t7500-commit-template-squash-signoff.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 7d02f79c0d..54c2082acb 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -498,7 +498,7 @@ test_expect_success 'invalid message options when using --fixup' '
cat >expected-template <<EOF
# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
+# with '#' will be ignored.
#
# Author: A U Thor <author@example.com>
#