mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
1640632b4f
This is pretty useful in `%<(100)%s%Cred%>(20)% an' where %s does not use up all 100 columns and %an needs more than 20 columns. By replacing %>(20) with %>>(20), %an can steal spaces from %s. %>> understands escape sequences, so %Cred does not stop it from stealing spaces in %<(100). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
277 lines
7.4 KiB
Bash
Executable file
277 lines
7.4 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010, Will Palmer
|
|
#
|
|
|
|
test_description='Test pretty formats'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'set up basic repos' '
|
|
>foo &&
|
|
>bar &&
|
|
git add foo &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
git add bar &&
|
|
test_tick &&
|
|
git commit -m "add bar"
|
|
'
|
|
|
|
test_expect_success 'alias builtin format' '
|
|
git log --pretty=oneline >expected &&
|
|
git config pretty.test-alias oneline &&
|
|
git log --pretty=test-alias >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'alias masking builtin format' '
|
|
git log --pretty=oneline >expected &&
|
|
git config pretty.oneline "%H" &&
|
|
git log --pretty=oneline >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'alias user-defined format' '
|
|
git log --pretty="format:%h" >expected &&
|
|
git config pretty.test-alias "format:%h" &&
|
|
git log --pretty=test-alias >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'alias user-defined tformat' '
|
|
git log --pretty="tformat:%h" >expected &&
|
|
git config pretty.test-alias "tformat:%h" &&
|
|
git log --pretty=test-alias >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'alias non-existent format' '
|
|
git config pretty.test-alias format-that-will-never-exist &&
|
|
test_must_fail git log --pretty=test-alias
|
|
'
|
|
|
|
test_expect_success 'alias of an alias' '
|
|
git log --pretty="tformat:%h" >expected &&
|
|
git config pretty.test-foo "tformat:%h" &&
|
|
git config pretty.test-bar test-foo &&
|
|
git log --pretty=test-bar >actual && test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'alias masking an alias' '
|
|
git log --pretty=format:"Two %H" >expected &&
|
|
git config pretty.duplicate "format:One %H" &&
|
|
git config --add pretty.duplicate "format:Two %H" &&
|
|
git log --pretty=duplicate >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'alias loop' '
|
|
git config pretty.test-foo test-bar &&
|
|
git config pretty.test-bar test-foo &&
|
|
test_must_fail git log --pretty=test-foo
|
|
'
|
|
|
|
test_expect_success 'NUL separation' '
|
|
printf "add bar\0initial" >expected &&
|
|
git log -z --pretty="format:%s" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'NUL termination' '
|
|
printf "add bar\0initial\0" >expected &&
|
|
git log -z --pretty="tformat:%s" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
git log -z --stat --pretty="format:%s" >actual &&
|
|
test_i18ncmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
git log -z --stat --pretty="tformat:%s" >actual &&
|
|
test_i18ncmp expected actual
|
|
'
|
|
|
|
test_expect_success 'setup more commits' '
|
|
test_commit "message one" one one message-one &&
|
|
test_commit "message two" two two message-two
|
|
'
|
|
|
|
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 &&
|
|
message two Z
|
|
message one Z
|
|
add bar Z
|
|
initial Z
|
|
EOF
|
|
test_cmp expected 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 &&
|
|
fa33ab1 message two Z
|
|
7cd6c63 message one Z
|
|
1711bf9 add bar Z
|
|
af20c06 initial 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 &&
|
|
message two
|
|
message one
|
|
add bar
|
|
initial
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
message ..
|
|
message ..
|
|
add bar Z
|
|
initial Z
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
..sage two
|
|
..sage one
|
|
add bar Z
|
|
initial Z
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
mess.. two
|
|
mess.. one
|
|
add bar Z
|
|
initial Z
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
Z message two
|
|
Z message one
|
|
Z add bar
|
|
Z initial
|
|
EOF
|
|
test_cmp expected 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 &&
|
|
fa33ab1 message two
|
|
7cd6c63 message one
|
|
1711bf9 add bar
|
|
af20c06 initial
|
|
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 &&
|
|
message two
|
|
message one
|
|
add bar
|
|
initial
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
Z message two Z
|
|
Z message one Z
|
|
Z add bar Z
|
|
Z initial Z
|
|
EOF
|
|
test_cmp expected 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 &&
|
|
fa33ab1 message two Z
|
|
7cd6c63 message one Z
|
|
1711bf9 add bar Z
|
|
af20c06 initial 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 &&
|
|
message two
|
|
message one
|
|
add bar
|
|
initial
|
|
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
|