undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4205 (log-pretty-format): use tformat rather than format

Browse Source 
Use `tformat` to avoid using of `echo` to complete end of line.

Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexey Shumkin 2014-05-21 17:20:05 +04:00 committed by Junio C Hamano
parent ee3efaf66c
commit c82134a9f3
1 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
t/t4205-log-pretty-formats.sh
View File

@ -144,9 +144,7 @@ test_expect_success 'setup more commits' '
' '
test_expect_success 'left alignment formatting' ' test_expect_success 'left alignment formatting' '
git log --pretty="format:%<(40)%s" >actual && git log --pretty="tformat:%<(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 two Z
message one Z message one Z
@ -157,9 +155,7 @@ EOF
' '
test_expect_success 'left alignment formatting at the nth column' ' test_expect_success 'left alignment formatting at the nth column' '
git log --pretty="format:%h %<|(40)%s" >actual && git log --pretty="tformat:%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 $head1 message two Z
$head2 message one Z $head2 message one Z
@ -170,9 +166,7 @@ EOF
' '
test_expect_success 'left alignment formatting with no padding' ' test_expect_success 'left alignment formatting with no padding' '
git log --pretty="format:%<(1)%s" >actual && git log --pretty="tformat:%<(1)%s" >actual &&
# complete the incomplete line at the end
echo >>actual &&
cat <<EOF >expected && cat <<EOF >expected &&
message two message two
message one message one
@ -183,9 +177,7 @@ EOF
' '
test_expect_success 'left alignment formatting with trunc' ' test_expect_success 'left alignment formatting with trunc' '
git log --pretty="format:%<(10,trunc)%s" >actual && git log --pretty="tformat:%<(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 ..
message .. message ..
@ -196,9 +188,7 @@ EOF
' '
test_expect_success 'left alignment formatting with ltrunc' ' test_expect_success 'left alignment formatting with ltrunc' '
git log --pretty="format:%<(10,ltrunc)%s" >actual && git log --pretty="tformat:%<(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 two
..sage one ..sage one
@ -209,9 +199,7 @@ EOF
' '
test_expect_success 'left alignment formatting with mtrunc' ' test_expect_success 'left alignment formatting with mtrunc' '
git log --pretty="format:%<(10,mtrunc)%s" >actual && git log --pretty="tformat:%<(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.. two
mess.. one mess.. one
@ -222,9 +210,7 @@ EOF
' '
test_expect_success 'right alignment formatting' ' test_expect_success 'right alignment formatting' '
git log --pretty="format:%>(40)%s" >actual && git log --pretty="tformat:%>(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 two
Z message one Z message one
@ -235,9 +221,7 @@ EOF
' '
test_expect_success 'right alignment formatting at the nth column' ' test_expect_success 'right alignment formatting at the nth column' '
git log --pretty="format:%h %>|(40)%s" >actual && git log --pretty="tformat:%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 $head1 message two
$head2 message one $head2 message one
@ -248,9 +232,7 @@ EOF
' '
test_expect_success 'right alignment formatting with no padding' ' test_expect_success 'right alignment formatting with no padding' '
git log --pretty="format:%>(1)%s" >actual && git log --pretty="tformat:%>(1)%s" >actual &&
# complete the incomplete line at the end
echo >>actual &&
cat <<EOF >expected && cat <<EOF >expected &&
message two message two
message one message one
@ -261,9 +243,7 @@ EOF
' '
test_expect_success 'center alignment formatting' ' test_expect_success 'center alignment formatting' '
git log --pretty="format:%><(40)%s" >actual && git log --pretty="tformat:%><(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 two Z
Z message one Z Z message one Z
@ -274,9 +254,7 @@ EOF
' '
test_expect_success 'center alignment formatting at the nth column' ' test_expect_success 'center alignment formatting at the nth column' '
git log --pretty="format:%h %><|(40)%s" >actual && git log --pretty="tformat:%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 $head1 message two Z
$head2 message one Z $head2 message one Z
@ -287,9 +265,7 @@ EOF
' '
test_expect_success 'center alignment formatting with no padding' ' test_expect_success 'center alignment formatting with no padding' '
git log --pretty="format:%><(1)%s" >actual && git log --pretty="tformat:%><(1)%s" >actual &&
# complete the incomplete line at the end
echo >>actual &&
cat <<EOF >expected && cat <<EOF >expected &&
message two message two
message one message one
@ -305,9 +281,7 @@ old_head1=$(git rev-parse --verify HEAD~0)
test_expect_success 'left/right alignment formatting with stealing' ' test_expect_success 'left/right alignment formatting with stealing' '
git commit --amend -m short --author "long long long <long@me.com>" && git commit --amend -m short --author "long long long <long@me.com>" &&
git log --pretty="format:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual && git log --pretty="tformat:%<(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 short long long long
message .. A U Thor message .. A U Thor