X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ft1002-read-tree-m-u-2way.sh;h=9c05f5e1f510664ca6ecce60eab5ffe1a30a58ef;hb=f45f88b2e483649cd063a7dc7826c03025683e56;hp=7ca2e65d102afd76dc4136a9f12c53a5ba0fce25;hpb=12accdc023f2b62109860cb745bdd1827b2c22de;p=thirdparty%2Fgit.git diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh index 7ca2e65d10..9c05f5e1f5 100755 --- a/t/t1002-read-tree-m-u-2way.sh +++ b/t/t1002-read-tree-m-u-2way.sh @@ -16,7 +16,7 @@ compare_change () { -e '1{/^diff --git /d;}' \ -e '2{/^index /d;}' \ -e '/^--- /d; /^+++ /d; /^@@ /d;' \ - -e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /' "$1" + -e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$OID_REGEX"' /\1 X /' "$1" test_cmp expected current }