Sync with 1.8.1.5

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index b1c76483866f55b4429fc76e7035e65984e7b4c2..cbd7a45927eb2d4b04649f21f82192091782ce90 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -517,4 +517,11 @@ use_template="-t template"
 
 try_commit_status_combo
 
+test_expect_success 'commit --status with custom comment character' '
+       test_when_finished "git config --unset core.commentchar" &&
+       git config core.commentchar ";" &&
+       try_commit --status &&
+       test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+'
+
 test_done