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

t4205 (log-pretty-formats): revert back single quotes

Browse Source 
In previuos commit de6029a (pretty: Add failing tests: --format output
should honor logOutputEncoding, 2013-06-26) single quotes were replaced
with double quotes to make "$(commit_msg)" expression in heredoc to
work. The same effect can be achieved by using "EOF" as a heredoc
delimiter instead of "\EOF".

Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
Suggested-by: Johannes Sixt <j.sixt@viscovery.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexey Shumkin 2013-07-05 16:01:47 +04:00 committed by Junio C Hamano
parent 14332bccc1
commit f3445f781f
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,174 +145,174 @@ test_expect_success 'setup more commits' '
head4=$(git rev-parse --verify --short HEAD~3) head4=$(git rev-parse --verify --short HEAD~3)
' '
test_expect_success 'left alignment formatting' " test_expect_success 'left alignment formatting' '
git log --pretty='format:%<(40)%s' >actual && git log --pretty="format:%<(40)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && 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
add bar Z add bar Z
$(commit_msg) Z $(commit_msg) Z
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%h %<|(40)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && 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
$head3 add bar Z $head3 add bar Z
$head4 $(commit_msg) Z $head4 $(commit_msg) Z
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%<(1)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && echo >>actual &&
cat <<\EOF >expected && cat <<EOF >expected &&
message two message two
message one message one
add bar add bar
$(commit_msg) $(commit_msg)
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%<(10,trunc)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && echo >>actual &&
qz_to_tab_space <<\EOF >expected && qz_to_tab_space <<EOF >expected &&
message .. message ..
message .. message ..
add bar Z add bar Z
$(commit_msg "" "8" "..*$") $(commit_msg "" "8" "..*$")
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%<(10,ltrunc)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && echo >>actual &&
qz_to_tab_space <<\EOF >expected && qz_to_tab_space <<EOF >expected &&
..sage two ..sage two
..sage one ..sage one
add bar Z add bar Z
$(commit_msg "" "0" ".\{11\}") $(commit_msg "" "0" ".\{11\}")
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%<(10,mtrunc)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && echo >>actual &&
qz_to_tab_space <<\EOF >expected && qz_to_tab_space <<EOF >expected &&
mess.. two mess.. two
mess.. one mess.. one
add bar Z add bar Z
$(commit_msg "" "4" ".\{11\}") $(commit_msg "" "4" ".\{11\}")
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
test_expect_success 'right alignment formatting' " test_expect_success 'right alignment formatting' '
git log --pretty='format:%>(40)%s' >actual && git log --pretty="format:%>(40)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && 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
Z add bar Z add bar
Z $(commit_msg) Z $(commit_msg)
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%h %>|(40)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && 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
$head3 add bar $head3 add bar
$head4 $(commit_msg) $head4 $(commit_msg)
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%>(1)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && echo >>actual &&
cat <<\EOF >expected && cat <<EOF >expected &&
message two message two
message one message one
add bar add bar
$(commit_msg) $(commit_msg)
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
test_expect_success 'center alignment formatting' " test_expect_success 'center alignment formatting' '
git log --pretty='format:%><(40)%s' >actual && git log --pretty="format:%><(40)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && 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
Z add bar Z Z add bar Z
Z $(commit_msg) Z Z $(commit_msg) Z
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%h %><|(40)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && 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
$head3 add bar Z $head3 add bar Z
$head4 $(commit_msg) Z $head4 $(commit_msg) Z
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%><(1)%s" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && echo >>actual &&
cat <<\EOF >expected && cat <<EOF >expected &&
message two message two
message one message one
add bar add bar
$(commit_msg) $(commit_msg)
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
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="format:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
# complete the incomplete line at the end # complete the incomplete line at the end
echo >>actual && echo >>actual &&
cat <<\EOF >expected && cat <<EOF >expected &&
short long long long short long long long
message .. A U Thor message .. A U Thor
add bar A U Thor add bar A U Thor
$(commit_msg "" "8" "..*$") A U Thor $(commit_msg "" "8" "..*$") A U Thor
EOF EOF
test_cmp expected actual test_cmp expected actual
" '
test_done test_done