t/t4013: fix futzing with the version string.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index b24c829f0f987a3a3951f1adfa7caaf2082da471..71c454356fbbcd5f67bdfc0b6ef7785fa8b712c1 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -88,7 +88,7 @@ test_expect_success setup '
 +*+ [initial] Initial
 EOF
 
 +*+ [initial] Initial
 EOF
 

-V=`git version | sed -e 's/^git version //'`
+V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'`

 while read cmd
 do
        case "$cmd" in
 while read cmd
 do
        case "$cmd" in


@@ -103,7 +103,9 @@ do
        test_expect_success "git $cmd" '
                {
                        echo "\$ git $cmd"
        test_expect_success "git $cmd" '
                {
                        echo "\$ git $cmd"

-                       git $cmd | sed -e "s/$V/g-i-t--v-e-r-s-i-o-n/"
+                       git $cmd |
+                       sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
+                           -e "s/^\\( *boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"

                        echo "\$"
                } >"$actual" &&
                if test -f "$expect"
                        echo "\$"
                } >"$actual" &&
                if test -f "$expect"