transport-helper: add 'force' to 'export' helpers

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 73ba5e8f0c386aa3762be942a5b1062ac82237d5..fb000411395d50639334c3c0395b2b975aa4bc12 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -1,20 +1,38 @@
 #!/bin/sh
 #
 # Copyright (c) 2010, Will Palmer
+# Copyright (c) 2011, Alexey Shumkin (+ non-UTF-8 commit encoding tests)
 #
 
 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),
+       # encoded in UTF-8, used as a commit log message below.
+       msg="initial. an${sample_utf8_part}lich\n"
+       if test -n "$1"
+       then
+               printf "$msg" | iconv -f utf-8 -t "$1"
+       else
+               printf "$msg"
+       fi
+}
+
 test_expect_success 'set up basic repos' '
        >foo &&
        >bar &&
        git add foo &&
        test_tick &&
-       git commit -m initial &&
+       git config i18n.commitEncoding iso8859-1 &&
+       git commit -m "$(commit_msg iso8859-1)" &&
        git add bar &&
        test_tick &&
-       git commit -m "add bar"
+       git commit -m "add bar" &&
+       git config --unset i18n.commitEncoding
 '
 
 test_expect_success 'alias builtin format' '
@@ -38,6 +56,20 @@ test_expect_success 'alias user-defined format' '
        test_cmp expected actual
 '
 
+test_expect_success 'alias user-defined tformat with %s (iso8859-1 encoding)' '
+       git config i18n.logOutputEncoding iso8859-1 &&
+       git log --oneline >expected-s &&
+       git log --pretty="tformat:%h %s" >actual-s &&
+       git config --unset i18n.logOutputEncoding &&
+       test_cmp expected-s actual-s
+'
+
+test_expect_success 'alias user-defined tformat with %s (utf-8 encoding)' '
+       git log --oneline >expected-s &&
+       git log --pretty="tformat:%h %s" >actual-s &&
+       test_cmp expected-s actual-s
+'
+
 test_expect_success 'alias user-defined tformat' '
        git log --pretty="tformat:%h" >expected &&
        git config pretty.test-alias "tformat:%h" &&
@@ -72,13 +104,13 @@ test_expect_success 'alias loop' '
 '
 
 test_expect_success 'NUL separation' '
-       printf "add bar\0initial" >expected &&
+       printf "add bar\0$(commit_msg)" >expected &&
        git log -z --pretty="format:%s" >actual &&
        test_cmp expected actual
 '
 
 test_expect_success 'NUL termination' '
-       printf "add bar\0initial\0" >expected &&
+       printf "add bar\0$(commit_msg)\0" >expected &&
        git log -z --pretty="tformat:%s" >actual &&
        test_cmp expected actual
 '
@@ -86,7 +118,7 @@ test_expect_success 'NUL termination' '
 test_expect_success 'NUL separation with --stat' '
        stat0_part=$(git diff --stat HEAD^ HEAD) &&
        stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
-       printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected &&
+       printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
        git log -z --stat --pretty="format:%s" >actual &&
        test_i18ncmp expected actual
 '
@@ -94,7 +126,7 @@ test_expect_success 'NUL separation with --stat' '
 test_expect_failure 'NUL termination with --stat' '
        stat0_part=$(git diff --stat HEAD^ HEAD) &&
        stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
-       printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n\0" >expected &&
+       printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
        git log -z --stat --pretty="tformat:%s" >actual &&
        test_i18ncmp expected actual
 '
@@ -112,37 +144,37 @@ test_expect_success 'left alignment formatting' '
        git log --pretty="format:%<(40)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 message two                            Z
 message one                            Z
 add bar                                Z
-initial                                Z
+$(commit_msg)                    Z
 EOF
        test_cmp expected actual
 '
 
-test_expect_success 'left alignment formatting at the nth column' "
-       git log --pretty='format:%h %<|(40)%s' >actual &&
+test_expect_success 'left alignment formatting at the nth column' '
+       git log --pretty="format:%h %<|(40)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 $head1 message two                    Z
 $head2 message one                    Z
 $head3 add bar                        Z
-$head4 initial                        Z
+$head4 $(commit_msg)            Z
 EOF
        test_cmp expected actual
-"
+'
 
 test_expect_success 'left alignment formatting with no padding' '
        git log --pretty="format:%<(1)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       cat <<\EOF >expected &&
+       cat <<EOF >expected &&
 message two
 message one
 add bar
-initial
+$(commit_msg)
 EOF
        test_cmp expected actual
 '
@@ -151,11 +183,11 @@ test_expect_success 'left alignment formatting with trunc' '
        git log --pretty="format:%<(10,trunc)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 message ..
 message ..
 add bar  Z
-initial  Z
+initial...
 EOF
        test_cmp expected actual
 '
@@ -164,11 +196,11 @@ test_expect_success 'left alignment formatting with ltrunc' '
        git log --pretty="format:%<(10,ltrunc)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 ..sage two
 ..sage one
 add bar  Z
-initial  Z
+..${sample_utf8_part}lich
 EOF
        test_cmp expected actual
 '
@@ -177,11 +209,11 @@ test_expect_success 'left alignment formatting with mtrunc' '
        git log --pretty="format:%<(10,mtrunc)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 mess.. two
 mess.. one
 add bar  Z
-initial  Z
+init..lich
 EOF
        test_cmp expected actual
 '
@@ -190,37 +222,37 @@ test_expect_success 'right alignment formatting' '
        git log --pretty="format:%>(40)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 Z                            message two
 Z                            message one
 Z                                add bar
-Z                                initial
+Z                    $(commit_msg)
 EOF
        test_cmp expected actual
 '
 
-test_expect_success 'right alignment formatting at the nth column' "
-       git log --pretty='format:%h %>|(40)%s' >actual &&
+test_expect_success 'right alignment formatting at the nth column' '
+       git log --pretty="format:%h %>|(40)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 $head1                      message two
 $head2                      message one
 $head3                          add bar
-$head4                          initial
+$head4              $(commit_msg)
 EOF
        test_cmp expected actual
-"
+'
 
 test_expect_success 'right alignment formatting with no padding' '
        git log --pretty="format:%>(1)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       cat <<\EOF >expected &&
+       cat <<EOF >expected &&
 message two
 message one
 add bar
-initial
+$(commit_msg)
 EOF
        test_cmp expected actual
 '
@@ -229,37 +261,37 @@ test_expect_success 'center alignment formatting' '
        git log --pretty="format:%><(40)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 Z             message two              Z
 Z             message one              Z
 Z               add bar                Z
-Z               initial                Z
+Z         $(commit_msg)          Z
 EOF
        test_cmp expected actual
 '
 
-test_expect_success 'center alignment formatting at the nth column' "
-       git log --pretty='format:%h %><|(40)%s' >actual &&
+test_expect_success 'center alignment formatting at the nth column' '
+       git log --pretty="format:%h %><|(40)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       qz_to_tab_space <<\EOF >expected &&
+       qz_to_tab_space <<EOF >expected &&
 $head1           message two          Z
 $head2           message one          Z
 $head3             add bar            Z
-$head4             initial            Z
+$head4       $(commit_msg)      Z
 EOF
        test_cmp expected actual
-"
+'
 
 test_expect_success 'center alignment formatting with no padding' '
        git log --pretty="format:%><(1)%s" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       cat <<\EOF >expected &&
+       cat <<EOF >expected &&
 message two
 message one
 add bar
-initial
+$(commit_msg)
 EOF
        test_cmp expected actual
 '
@@ -269,11 +301,11 @@ test_expect_success 'left/right alignment formatting with stealing' '
        git log --pretty="format:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
        # complete the incomplete line at the end
        echo >>actual &&
-       cat <<\EOF >expected &&
+       cat <<EOF >expected &&
 short long  long long
 message ..   A U Thor
 add bar      A U Thor
-initial      A U Thor
+initial...   A U Thor
 EOF
        test_cmp expected actual
 '