X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4013-diff-various.sh;h=ed37141b6e5afd8294c5961a1ab96c634a5f4a82;hb=8232dc427fb4b92b38e74e9e93b52231a67e354f;hp=b24c829f0f987a3a3951f1adfa7caaf2082da471;hpb=5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20;p=git.git

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index b24c829f0..ed37141b6 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -73,6 +73,7 @@ test_expect_success setup '
 	for i in 1 2; do echo $i; done >>dir/sub &&
 	git update-index file0 dir/sub &&
 
+	git repo-config log.showroot false &&
 	git commit --amend &&
 	git show-branch
 '
@@ -88,7 +89,7 @@ test_expect_success setup '
 +*+ [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
@@ -103,7 +104,9 @@ do
 	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"