Introduce remove_or_warn function

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 6e18a96319bef5c4ddfbc86ce79b02b364f04387..9f5c3edb0392c321092e56e2bf46fd096f74cf75 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -149,11 +149,8 @@ EOF
 
 test_expect_success '--signoff' '
        echo "yet another content *narf*" >> foo &&
-       echo "zort" | (
-               test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-               git commit -s -F - foo
-       ) &&
-       git cat-file commit HEAD | sed "1,/^$/d" > output &&
+       echo "zort" | git commit -s -F - foo &&
+       git cat-file commit HEAD | sed "1,/^\$/d" > output &&
        test_cmp expect output
 '
 
@@ -186,4 +183,14 @@ test_expect_success 'commit message from stdin' '
        commit_msg_is "Log with foo word"
 '
 
+test_expect_success 'commit -F overrides -t' '
+       (
+               cd subdir &&
+               echo "-F log" > f.log &&
+               echo "-t template" > t.template &&
+               git commit --allow-empty -F f.log -t t.template
+       ) &&
+       commit_msg_is "-F log"
+'
+
 test_done