Merge branch 'jk/apache-test-for-2.4'

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index b8685b97f99e568e88c4add70b8f2841ec742267..26fbfde4a36689a51c181c13f9d5680fd2780219 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -260,4 +260,18 @@ EOF
        test_cmp expected actual
 '
 
+test_expect_success 'left/right alignment formatting with stealing' '
+       git commit --amend -m short --author "long long long <long@me.com>" &&
+       git log --pretty="format:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
+       # complete the incomplete line at the end
+       echo >>actual &&
+       cat <<\EOF >expected &&
+short long  long long
+message ..   A U Thor
+add bar      A U Thor
+initial      A U Thor
+EOF
+       test_cmp expected actual
+'
+
 test_done