Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ad42c78d7c21497a6ebb4e9cef4efd6334f947da..fe94552296bb98ef78dbc51e8b1f7d4a665cf0a4 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -234,7 +234,7 @@ cat >.git/FAKE_EDITOR <<EOF
 # kill -TERM command added below.
 EOF
 
-test_expect_success 'a SIGTERM should break locks' '
+test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' '
        echo >>negative &&
        ! "$SHELL_PATH" -c '\''
          echo kill -TERM $$ >> .git/FAKE_EDITOR
@@ -258,4 +258,13 @@ test_expect_success 'Hand committing of a redundant merge removes dups' '
 
 '
 
+test_expect_success 'A single-liner subject with a token plus colon is not a footer' '
+
+       git reset --hard &&
+       git commit -s -m "hello: kitty" --allow-empty &&
+       git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+       test $(wc -l <actual) = 3
+
+'
+
 test_done