xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 26bd8ee469ad5bad5e4e9700c490cb3e3cb73b83..baed6ce96beb260a32e027dd573313c82202ea7b 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -81,7 +81,7 @@ test_expect_success 'explicit commit message should override template' '
        git add foo &&
        GIT_EDITOR=../t7500/add-content git commit --template "$TEMPLATE" \
                -m "command line msg" &&
-       commit_msg_is "command line msg<unknown>"
+       commit_msg_is "command line msg"
 '
 
 test_expect_success 'commit message from file should override template' '
@@ -90,7 +90,7 @@ test_expect_success 'commit message from file should override template' '
        echo "standard input msg" |
                GIT_EDITOR=../t7500/add-content git commit \
                        --template "$TEMPLATE" --file - &&
-       commit_msg_is "standard input msg<unknown>"
+       commit_msg_is "standard input msg"
 '
 
 test_expect_success 'using alternate GIT_INDEX_FILE (1)' '
@@ -122,7 +122,20 @@ test_expect_success 'using alternate GIT_INDEX_FILE (2)' '
 
        ) &&
        cmp .git/index saved-index >/dev/null
+'
+
+cat > expect << EOF
+zort
+
+Signed-off-by: C O Mitter <committer@example.com>
+EOF
 
+test_expect_success '--signoff' '
+       echo "yet another content *narf*" >> foo &&
+       echo "zort" |
+               GIT_EDITOR=../t7500/add-content git commit -s -F - foo &&
+       git cat-file commit HEAD | sed "1,/^$/d" > output &&
+       diff expect output
 '
 
 test_done