Merge branch 'jk/duplicate-objects-in-packs'

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index ef9770a52b0e5940d1eabda07471aea1eb44c753..fb000411395d50639334c3c0395b2b975aa4bc12 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -7,24 +7,19 @@
 test_description='Test pretty formats'
 . ./test-lib.sh
 
+sample_utf8_part=$(printf "f\303\244ng")
+
 commit_msg () {
-       # String "initial. initial" partly in German (translated with Google Translate),
+       # String "initial. initial" partly in German
+       # (translated with Google Translate),
        # encoded in UTF-8, used as a commit log message below.
-       msg=$(printf "initial. anf\303\244nglich")
+       msg="initial. an${sample_utf8_part}lich\n"
        if test -n "$1"
        then
-               msg=$(echo $msg | iconv -f utf-8 -t $1)
-       fi
-       if test -n "$2" -a -n "$3"
-       then
-               # cut string, replace cut part with two dots
-               # $2 - chars count from the beginning of the string
-               # $3 - "trailing" chars
-               # LC_ALL is set to make `sed` interpret "." as a UTF-8 char not a byte
-               # as it does with C locale
-               msg=$(echo $msg | LC_ALL=en_US.UTF-8 sed -e "s/^\(.\{$2\}\)$3/\1../")
+               printf "$msg" | iconv -f utf-8 -t "$1"
+       else
+               printf "$msg"
        fi
-       echo $msg
 }
 
 test_expect_success 'set up basic repos' '
@@ -192,7 +187,7 @@ test_expect_success 'left alignment formatting with trunc' '
 message ..
 message ..
 add bar  Z
-$(commit_msg "" "8" "..*$")
+initial...
 EOF
        test_cmp expected actual
 '
@@ -205,7 +200,7 @@ test_expect_success 'left alignment formatting with ltrunc' '
 ..sage two
 ..sage one
 add bar  Z
-$(commit_msg "" "0" ".\{11\}")
+..${sample_utf8_part}lich
 EOF
        test_cmp expected actual
 '
@@ -218,7 +213,7 @@ test_expect_success 'left alignment formatting with mtrunc' '
 mess.. two
 mess.. one
 add bar  Z
-$(commit_msg "" "4" ".\{11\}")
+init..lich
 EOF
        test_cmp expected actual
 '
@@ -310,7 +305,7 @@ test_expect_success 'left/right alignment formatting with stealing' '
 short long  long long
 message ..   A U Thor
 add bar      A U Thor
-$(commit_msg "" "8" "..*$")   A U Thor
+initial...   A U Thor
 EOF
        test_cmp expected actual
 '