2010-05-02 13:00:44 +02:00
#!/bin/sh
#
# Copyright (c) 2010, Will Palmer
2013-06-26 12:19:49 +02:00
# Copyright (c) 2011, Alexey Shumkin (+ non-UTF-8 commit encoding tests)
2010-05-02 13:00:44 +02:00
#
test_description = 'Test pretty formats'
. ./test-lib.sh
2014-05-21 15:20:04 +02:00
# Tested non-UTF-8 encoding
test_encoding = "ISO8859-1"
2013-07-05 14:01:50 +02:00
sample_utf8_part = $( printf "f\303\244ng" )
2013-06-26 12:19:49 +02:00
commit_msg ( ) {
2013-07-05 14:01:48 +02:00
# String "initial. initial" partly in German
# (translated with Google Translate),
2013-06-26 12:19:49 +02:00
# encoded in UTF-8, used as a commit log message below.
2013-07-05 14:01:50 +02:00
msg = " initial. an ${ sample_utf8_part } lich\n "
2013-06-26 12:19:49 +02:00
if test -n " $1 "
then
2013-07-05 14:01:50 +02:00
printf " $msg " | iconv -f utf-8 -t " $1 "
else
printf " $msg "
2013-06-26 12:19:49 +02:00
fi
}
2010-05-02 13:00:44 +02:00
test_expect_success 'set up basic repos' '
>foo &&
>bar &&
git add foo &&
test_tick &&
2014-05-21 15:20:04 +02:00
git config i18n.commitEncoding $test_encoding &&
2013-09-02 16:44:54 +02:00
commit_msg $test_encoding | git commit -F - &&
2010-05-02 13:00:44 +02:00
git add bar &&
test_tick &&
2013-06-26 12:19:49 +02:00
git commit -m "add bar" &&
git config --unset i18n.commitEncoding
2010-05-02 13:00:44 +02:00
'
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
'
2014-05-21 15:20:04 +02:00
test_expect_success 'alias user-defined tformat with %s (ISO8859-1 encoding)' '
git config i18n.logOutputEncoding $test_encoding &&
2013-06-26 12:19:49 +02:00
git log --oneline >expected-s &&
git log --pretty= "tformat:%h %s" >actual-s &&
git config --unset i18n.logOutputEncoding &&
test_cmp expected-s actual-s
'
2013-06-26 12:19:50 +02:00
test_expect_success 'alias user-defined tformat with %s (utf-8 encoding)' '
2013-06-26 12:19:49 +02:00
git log --oneline >expected-s &&
git log --pretty= "tformat:%h %s" >actual-s &&
test_cmp expected-s actual-s
'
2010-05-02 13:00:44 +02:00
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
'
2011-06-16 15:42:48 +02:00
test_expect_success 'alias non-existent format' '
2010-05-02 13:00:44 +02:00
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
'
2013-06-26 12:19:50 +02:00
test_expect_success 'NUL separation' '
2013-06-26 12:19:49 +02:00
printf " add bar\0 $( commit_msg) " >expected &&
2012-04-30 22:28:25 +02:00
git log -z --pretty= "format:%s" >actual &&
test_cmp expected actual
'
2013-06-26 12:19:50 +02:00
test_expect_success 'NUL termination' '
2013-06-26 12:19:49 +02:00
printf " add bar\0 $( commit_msg) \0 " >expected &&
2012-04-30 22:28:25 +02:00
git log -z --pretty= "tformat:%s" >actual &&
test_cmp expected actual
'
2013-06-26 12:19:50 +02:00
test_expect_success 'NUL separation with --stat' '
2012-05-01 19:29:43 +02:00
stat0_part = $( git diff --stat HEAD^ HEAD) &&
Fix "git diff --stat" for interesting - but empty - file changes
The behavior of "git diff --stat" is rather odd for files that have
zero lines of changes: it will discount them entirely unless they were
renames.
Which means that the stat output will simply not show files that only
had "other" changes: they were created or deleted, or their mode was
changed.
Now, those changes do show up in the summary, but so do renames, so
the diffstat logic is inconsistent. Why does it show renames with zero
lines changed, but not mode changes or added files with zero lines
changed?
So change the logic to not check for "is_renamed", but for
"is_interesting" instead, where "interesting" is judged to be any
action but a pure data change (because a pure data change with zero
data changed really isn't worth showing, if we ever get one in our
diffpairs).
So if you did
chmod +x Makefile
git diff --stat
before, it would show empty (" 0 files changed"), with this it shows
Makefile | 0
1 file changed, 0 insertions(+), 0 deletions(-)
which I think is a more correct diffstat (and then with "--summary" it
shows *what* the metadata change to Makefile was - this is completely
consistent with our handling of renamed files).
Side note: the old behavior was *really* odd. With no changes at all,
"git diff --stat" output was empty. With just a chmod, it said "0
files changed". No way is our legacy behavior sane.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-17 19:00:37 +02:00
stat1_part = $( git diff-tree --no-commit-id --stat --root HEAD^) &&
2013-06-26 12:19:49 +02:00
printf " add bar\n $stat0_part \n\0 $( commit_msg) \n $stat1_part \n " >expected &&
2012-05-01 19:29:43 +02:00
git log -z --stat --pretty= "format:%s" >actual &&
2012-08-27 07:36:51 +02:00
test_i18ncmp expected actual
2012-05-01 19:29:43 +02:00
'
2017-05-05 20:19:32 +02:00
test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '
2012-05-01 19:29:43 +02:00
stat0_part = $( git diff --stat HEAD^ HEAD) &&
Fix "git diff --stat" for interesting - but empty - file changes
The behavior of "git diff --stat" is rather odd for files that have
zero lines of changes: it will discount them entirely unless they were
renames.
Which means that the stat output will simply not show files that only
had "other" changes: they were created or deleted, or their mode was
changed.
Now, those changes do show up in the summary, but so do renames, so
the diffstat logic is inconsistent. Why does it show renames with zero
lines changed, but not mode changes or added files with zero lines
changed?
So change the logic to not check for "is_renamed", but for
"is_interesting" instead, where "interesting" is judged to be any
action but a pure data change (because a pure data change with zero
data changed really isn't worth showing, if we ever get one in our
diffpairs).
So if you did
chmod +x Makefile
git diff --stat
before, it would show empty (" 0 files changed"), with this it shows
Makefile | 0
1 file changed, 0 insertions(+), 0 deletions(-)
which I think is a more correct diffstat (and then with "--summary" it
shows *what* the metadata change to Makefile was - this is completely
consistent with our handling of renamed files).
Side note: the old behavior was *really* odd. With no changes at all,
"git diff --stat" output was empty. With just a chmod, it said "0
files changed". No way is our legacy behavior sane.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-17 19:00:37 +02:00
stat1_part = $( git diff-tree --no-commit-id --stat --root HEAD^) &&
2013-06-26 12:19:49 +02:00
printf " add bar\n $stat0_part \n\0 $( commit_msg) \n $stat1_part \n0 " >expected &&
2012-05-01 19:29:43 +02:00
git log -z --stat --pretty= "tformat:%s" >actual &&
2017-05-05 20:19:32 +02:00
test_cmp expected actual
2012-05-01 19:29:43 +02:00
'
2019-11-20 01:51:18 +01:00
for p in short medium full fuller email raw
do
test_expect_success " NUL termination with --reflog --pretty= $p " '
revs = " $( git rev-list --reflog) " &&
for r in $revs
do
git show -s " $r " --pretty= " $p " &&
printf "\0" || return 1
done >expect &&
{
git log -z --reflog --pretty= " $p " &&
printf "\0"
} >actual &&
test_cmp expect actual
'
done
test_expect_success 'NUL termination with --reflog --pretty=oneline' '
revs = " $( git rev-list --reflog) " &&
for r in $revs
do
git show -s --pretty= oneline " $r " >raw &&
cat raw | lf_to_nul || exit 1
done >expect &&
# the trailing NUL is already produced so we do not need to
# output another one
git log -z --pretty= oneline --reflog >actual &&
test_cmp expect actual
'
2013-04-19 01:08:50 +02:00
test_expect_success 'setup more commits' '
test_commit "message one" one one message-one &&
2013-06-26 12:19:48 +02:00
test_commit "message two" two two message-two &&
head1 = $( git rev-parse --verify --short HEAD~0) &&
head2 = $( git rev-parse --verify --short HEAD~1) &&
head3 = $( git rev-parse --verify --short HEAD~2) &&
head4 = $( git rev-parse --verify --short HEAD~3)
2013-04-19 01:08:50 +02:00
'
2013-07-05 14:01:47 +02:00
test_expect_success 'left alignment formatting' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%<(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
message two Z
message one Z
add bar Z
$( commit_msg) Z
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2014-05-21 15:20:06 +02:00
test_expect_success 'left alignment formatting. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%<(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
message two Z
message one Z
add bar Z
$( commit_msg) Z
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'left alignment formatting at the nth column' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%h %<|(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
$head1 message two Z
$head2 message one Z
$head3 add bar Z
$head4 $( commit_msg) Z
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2016-06-16 15:18:38 +02:00
test_expect_success 'left alignment formatting at the nth column' '
COLUMNS = 50 git log --pretty= "tformat:%h %<|(-10)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
$head1 message two Z
$head2 message one Z
$head3 add bar Z
$head4 $( commit_msg) Z
EOF
2016-06-16 15:18:38 +02:00
test_cmp expected actual
'
2014-05-21 15:20:06 +02:00
test_expect_success 'left alignment formatting at the nth column. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%h %<|(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
$head1 message two Z
$head2 message one Z
$head3 add bar Z
$head4 $( commit_msg) Z
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'left alignment formatting with no padding' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%<(1)%s" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF >expected &&
message two
message one
add bar
$( commit_msg)
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2014-05-21 15:20:06 +02:00
test_expect_success 'left alignment formatting with no padding. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%<(1)%s" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
message two
message one
add bar
$( commit_msg)
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'left alignment formatting with trunc' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%<(10,trunc)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-\E OF >expected &&
message ..
message ..
add bar Z
initial...
EOF
2013-04-19 01:08:51 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:51 +02:00
2014-05-21 15:20:07 +02:00
test_expect_success 'left alignment formatting with trunc. i18n.logOutputEncoding' '
2014-05-21 15:20:06 +02:00
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%<(10,trunc)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-\E OF | iconv -f utf-8 -t $test_encoding >expected &&
message ..
message ..
add bar Z
initial...
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'left alignment formatting with ltrunc' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%<(10,ltrunc)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
..sage two
..sage one
add bar Z
..${ sample_utf8_part } lich
EOF
2013-04-19 01:08:51 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:51 +02:00
2014-05-21 15:20:07 +02:00
test_expect_success 'left alignment formatting with ltrunc. i18n.logOutputEncoding' '
2014-05-21 15:20:06 +02:00
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%<(10,ltrunc)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
..sage two
..sage one
add bar Z
..${ sample_utf8_part } lich
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'left alignment formatting with mtrunc' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%<(10,mtrunc)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-\E OF >expected &&
mess.. two
mess.. one
add bar Z
init..lich
EOF
2013-04-19 01:08:51 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:51 +02:00
2014-05-21 15:20:07 +02:00
test_expect_success 'left alignment formatting with mtrunc. i18n.logOutputEncoding' '
2014-05-21 15:20:06 +02:00
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%<(10,mtrunc)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-\E OF | iconv -f utf-8 -t $test_encoding >expected &&
mess.. two
mess.. one
add bar Z
init..lich
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'right alignment formatting' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%>(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
Z message two
Z message one
Z add bar
Z $( commit_msg)
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2014-05-21 15:20:06 +02:00
test_expect_success 'right alignment formatting. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%>(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
Z message two
Z message one
Z add bar
Z $( commit_msg)
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'right alignment formatting at the nth column' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%h %>|(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
$head1 message two
$head2 message one
$head3 add bar
$head4 $( commit_msg)
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2016-06-16 15:18:38 +02:00
test_expect_success 'right alignment formatting at the nth column' '
COLUMNS = 50 git log --pretty= "tformat:%h %>|(-10)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
$head1 message two
$head2 message one
$head3 add bar
$head4 $( commit_msg)
EOF
2016-06-16 15:18:38 +02:00
test_cmp expected actual
'
2014-05-21 15:20:06 +02:00
test_expect_success 'right alignment formatting at the nth column. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%h %>|(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
$head1 message two
$head2 message one
$head3 add bar
$head4 $( commit_msg)
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2016-06-16 15:18:37 +02:00
# Note: Space between 'message' and 'two' should be in the same column
# as in previous test.
test_expect_success 'right alignment formatting at the nth column with --graph. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --graph --pretty= "tformat:%h %>|(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
iconv -f utf-8 -t $test_encoding >expected <<-EOF &&
* $head1 message two
* $head2 message one
* $head3 add bar
* $head4 $( commit_msg)
EOF
2016-06-16 15:18:37 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'right alignment formatting with no padding' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%>(1)%s" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF >expected &&
message two
message one
add bar
$( commit_msg)
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2016-06-16 15:18:37 +02:00
test_expect_success 'right alignment formatting with no padding and with --graph' '
git log --graph --pretty= "tformat:%>(1)%s" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF >expected &&
* message two
* message one
* add bar
* $( commit_msg)
EOF
2016-06-16 15:18:37 +02:00
test_cmp expected actual
'
2014-05-21 15:20:06 +02:00
test_expect_success 'right alignment formatting with no padding. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%>(1)%s" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
message two
message one
add bar
$( commit_msg)
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'center alignment formatting' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%><(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
Z message two Z
Z message one Z
Z add bar Z
Z $( commit_msg) Z
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2014-05-21 15:20:06 +02:00
test_expect_success 'center alignment formatting. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%><(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
Z message two Z
Z message one Z
Z add bar Z
Z $( commit_msg) Z
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'center alignment formatting at the nth column' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%h %><|(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
$head1 message two Z
$head2 message one Z
$head3 add bar Z
$head4 $( commit_msg) Z
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2016-06-16 15:18:38 +02:00
test_expect_success 'center alignment formatting at the nth column' '
COLUMNS = 70 git log --pretty= "tformat:%h %><|(-30)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF >expected &&
$head1 message two Z
$head2 message one Z
$head3 add bar Z
$head4 $( commit_msg) Z
EOF
2016-06-16 15:18:38 +02:00
test_cmp expected actual
'
2014-05-21 15:20:06 +02:00
test_expect_success 'center alignment formatting at the nth column. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%h %><|(40)%s" >actual &&
2016-07-27 20:55:23 +02:00
qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
$head1 message two Z
$head2 message one Z
$head3 add bar Z
$head4 $( commit_msg) Z
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-07-05 14:01:47 +02:00
test_expect_success 'center alignment formatting with no padding' '
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%><(1)%s" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF >expected &&
message two
message one
add bar
$( commit_msg)
EOF
2013-04-19 01:08:50 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2013-04-19 01:08:50 +02:00
2014-05-19 17:28:16 +02:00
# save HEAD's SHA-1 digest (with no abbreviations) to use it below
# as far as the next test amends HEAD
old_head1 = $( git rev-parse --verify HEAD~0)
2014-05-21 15:20:06 +02:00
test_expect_success 'center alignment formatting with no padding. i18n.logOutputEncoding' '
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%><(1)%s" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
message two
message one
add bar
$( commit_msg)
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2014-05-19 17:28:16 +02:00
2013-07-05 14:01:47 +02:00
test_expect_success 'left/right alignment formatting with stealing' '
git commit --amend -m short --author "long long long <long@me.com>" &&
2014-05-21 15:20:05 +02:00
git log --pretty= "tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-\E OF >expected &&
short long long long
message .. A U Thor
add bar A U Thor
initial... A U Thor
EOF
2013-04-19 01:08:52 +02:00
test_cmp expected actual
2013-07-05 14:01:47 +02:00
'
2014-05-21 15:20:07 +02:00
test_expect_success 'left/right alignment formatting with stealing. i18n.logOutputEncoding' '
2014-05-21 15:20:06 +02:00
git -c i18n.logOutputEncoding= $test_encoding log --pretty= "tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
2016-07-27 20:55:23 +02:00
cat <<-\E OF | iconv -f utf-8 -t $test_encoding >expected &&
short long long long
message .. A U Thor
add bar A U Thor
initial... A U Thor
EOF
2014-05-21 15:20:06 +02:00
test_cmp expected actual
'
2013-04-19 01:08:52 +02:00
2014-08-10 09:05:21 +02:00
test_expect_success 'strbuf_utf8_replace() not producing NUL' '
git log --color --pretty= "tformat:%<(10,trunc)%s%>>(10,ltrunc)%C(auto)%d" |
test_decode_color |
nul_to_q >actual &&
! grep Q actual
'
2014-08-29 18:58:42 +02:00
# ISO strict date format
test_expect_success 'ISO and ISO-strict date formats display the same values' '
git log --format= %ai%n%ci |
sed -e "s/ /T/; s/ //; s/..\$/:&/" >expected &&
git log --format= %aI%n%cI >actual &&
test_cmp expected actual
'
2019-11-20 01:51:21 +01:00
test_expect_success 'short date' '
git log --format= %ad%n%cd --date= short >expected &&
git log --format= %as%n%cs >actual &&
test_cmp expected actual
'
2014-05-19 17:28:16 +02:00
# get new digests (with no abbreviations)
2016-07-27 20:55:02 +02:00
test_expect_success 'set up log decoration tests' '
head1 = $( git rev-parse --verify HEAD~0) &&
head2 = $( git rev-parse --verify HEAD~1)
'
2014-05-19 17:28:16 +02:00
2013-12-17 05:28:21 +01:00
test_expect_success 'log decoration properly follows tag chain' '
git tag -a tag1 -m tag1 &&
git tag -a tag2 -m tag2 tag1 &&
git tag -d tag1 &&
git commit --amend -m shorter &&
git log --no-walk --tags --pretty= "%H %d" --decorate= full >actual &&
2016-07-27 20:55:23 +02:00
cat <<-EOF >expected &&
$head2 ( tag: refs/tags/message-one)
$old_head1 ( tag: refs/tags/message-two)
2018-05-21 04:01:43 +02:00
$head1 ( tag: refs/tags/tag2)
2016-07-27 20:55:23 +02:00
EOF
2018-05-21 04:01:43 +02:00
sort -k3 actual >actual1 &&
2013-12-17 05:28:21 +01:00
test_cmp expected actual1
'
2014-09-18 22:53:53 +02:00
test_expect_success 'clean log decoration' '
git log --no-walk --tags --pretty= "%H %D" --decorate= full >actual &&
2016-07-27 20:55:23 +02:00
cat >expected <<-EOF &&
$head2 tag: refs/tags/message-one
$old_head1 tag: refs/tags/message-two
2018-05-21 04:01:43 +02:00
$head1 tag: refs/tags/tag2
2016-07-27 20:55:23 +02:00
EOF
2018-05-21 04:01:43 +02:00
sort -k3 actual >actual1 &&
2014-09-18 22:53:53 +02:00
test_cmp expected actual1
'
2016-11-19 01:58:14 +01:00
cat >trailers <<EOF
Signed-off-by: A U Thor <author@example.com>
Acked-by: A U Thor <author@example.com>
[ v2 updated patch description ]
2017-08-15 12:24:39 +02:00
Signed-off-by: A U Thor
<author@example.com>
2016-11-19 01:58:14 +01:00
EOF
2017-08-15 12:25:27 +02:00
unfold ( ) {
2017-10-02 07:25:19 +02:00
perl -0pe 's/\n\s+/ /g'
2017-08-15 12:25:27 +02:00
}
2017-08-15 12:24:39 +02:00
test_expect_success 'set up trailer tests' '
2016-11-19 01:58:14 +01:00
echo "Some contents" >trailerfile &&
git add trailerfile &&
2017-08-15 12:24:39 +02:00
git commit -F - <<-EOF
2016-11-19 01:58:14 +01:00
trailers: this commit message has trailers
This commit is a test commit with trailers at the end. We parse this
2017-08-15 12:24:39 +02:00
message and display the trailers using %( trailers) .
2016-11-19 01:58:14 +01:00
$( cat trailers)
EOF
2017-08-15 12:24:39 +02:00
'
2016-11-19 01:58:14 +01:00
2017-08-15 12:24:39 +02:00
test_expect_success 'pretty format %(trailers) shows trailers' '
git log --no-walk --pretty= "%(trailers)" >actual &&
{
cat trailers &&
echo
} >expect &&
2016-11-19 01:58:14 +01:00
test_cmp expect actual
'
2017-08-15 12:25:27 +02:00
test_expect_success '%(trailers:only) shows only "key: value" trailers' '
git log --no-walk --pretty= "%(trailers:only)" >actual &&
{
grep -v patch.description <trailers &&
echo
} >expect &&
test_cmp expect actual
'
2019-01-29 07:49:00 +01:00
test_expect_success '%(trailers:only=yes) shows only "key: value" trailers' '
git log --no-walk --pretty= format:"%(trailers:only=yes)" >actual &&
grep -v patch.description <trailers >expect &&
test_cmp expect actual
'
test_expect_success '%(trailers:only=no) shows all trailers' '
git log --no-walk --pretty= format:"%(trailers:only=no)" >actual &&
cat trailers >expect &&
test_cmp expect actual
'
test_expect_success '%(trailers:only=no,only=true) shows only "key: value" trailers' '
git log --no-walk --pretty= format:"%(trailers:only=yes)" >actual &&
grep -v patch.description <trailers >expect &&
test_cmp expect actual
2017-08-15 12:25:27 +02:00
'
test_expect_success '%(trailers:unfold) unfolds trailers' '
git log --no-walk --pretty= "%(trailers:unfold)" >actual &&
{
unfold <trailers &&
echo
} >expect &&
test_cmp expect actual
'
test_expect_success ':only and :unfold work together' '
2017-10-01 18:18:47 +02:00
git log --no-walk --pretty= "%(trailers:only,unfold)" >actual &&
git log --no-walk --pretty= "%(trailers:unfold,only)" >reverse &&
2017-08-15 12:25:27 +02:00
test_cmp actual reverse &&
{
grep -v patch.description <trailers | unfold &&
echo
} >expect &&
test_cmp expect actual
'
2019-01-28 22:33:34 +01:00
test_expect_success 'pretty format %(trailers:key=foo) shows that trailer' '
git log --no-walk --pretty= "format:%(trailers:key=Acked-by)" >actual &&
echo "Acked-by: A U Thor <author@example.com>" >expect &&
test_cmp expect actual
'
test_expect_success 'pretty format %(trailers:key=foo) is case insensitive' '
git log --no-walk --pretty= "format:%(trailers:key=AcKed-bY)" >actual &&
echo "Acked-by: A U Thor <author@example.com>" >expect &&
test_cmp expect actual
'
test_expect_success 'pretty format %(trailers:key=foo:) trailing colon also works' '
git log --no-walk --pretty= "format:%(trailers:key=Acked-by:)" >actual &&
echo "Acked-by: A U Thor <author@example.com>" >expect &&
test_cmp expect actual
'
test_expect_success 'pretty format %(trailers:key=foo) multiple keys' '
git log --no-walk --pretty= "format:%(trailers:key=Acked-by:,key=Signed-off-By)" >actual &&
grep -v patch.description <trailers >expect &&
test_cmp expect actual
'
2019-11-05 18:07:25 +01:00
test_expect_success '%(trailers:key=nonexistent) becomes empty' '
2019-01-28 22:33:34 +01:00
git log --no-walk --pretty= "x%(trailers:key=Nacked-by)x" >actual &&
echo "xx" >expect &&
test_cmp expect actual
'
test_expect_success '%(trailers:key=foo) handles multiple lines even if folded' '
git log --no-walk --pretty= "format:%(trailers:key=Signed-Off-by)" >actual &&
grep -v patch.description <trailers | grep -v Acked-by >expect &&
test_cmp expect actual
'
test_expect_success '%(trailers:key=foo,unfold) properly unfolds' '
git log --no-walk --pretty= "format:%(trailers:key=Signed-Off-by,unfold)" >actual &&
unfold <trailers | grep Signed-off-by >expect &&
test_cmp expect actual
'
test_expect_success 'pretty format %(trailers:key=foo,only=no) also includes nontrailer lines' '
git log --no-walk --pretty= "format:%(trailers:key=Acked-by,only=no)" >actual &&
{
echo "Acked-by: A U Thor <author@example.com>" &&
grep patch.description <trailers
} >expect &&
test_cmp expect actual
'
test_expect_success '%(trailers:key) without value is error' '
git log --no-walk --pretty= "tformat:%(trailers:key)" >actual &&
echo "%(trailers:key)" >expect &&
test_cmp expect actual
'
2019-01-28 22:33:35 +01:00
test_expect_success '%(trailers:key=foo,valueonly) shows only value' '
git log --no-walk --pretty= "format:%(trailers:key=Acked-by,valueonly)" >actual &&
echo "A U Thor <author@example.com>" >expect &&
test_cmp expect actual
'
2019-01-28 22:33:37 +01:00
test_expect_success 'pretty format %(trailers:separator) changes separator' '
git log --no-walk --pretty= format:"X%(trailers:separator=%x00,unfold)X" >actual &&
printf "XSigned-off-by: A U Thor <author@example.com>\0Acked-by: A U Thor <author@example.com>\0[ v2 updated patch description ]\0Signed-off-by: A U Thor <author@example.com>X" >expect &&
test_cmp expect actual
'
test_expect_success 'pretty format %(trailers) combining separator/key/valueonly' '
git commit --allow-empty -F - <<-\E OF &&
Important fix
The fix is explained here
Closes: #1234
EOF
git commit --allow-empty -F - <<-\E OF &&
Another fix
The fix is explained here
Closes: #567
Closes: #890
EOF
git commit --allow-empty -F - <<-\E OF &&
Does not close any tickets
EOF
git log --pretty= "%s% (trailers:separator=%x2c%x20,key=Closes,valueonly)" HEAD~3.. >actual &&
test_write_lines \
"Does not close any tickets" \
"Another fix #567, #890" \
"Important fix #1234" >expect &&
test_cmp expect actual
'
2018-08-23 02:50:17 +02:00
test_expect_success 'trailer parsing not fooled by --- line' '
git commit --allow-empty -F - <<-\E OF &&
this is the subject
This is the body. The message has a "---" line which would confuse a
message+patch parser. But here we know we have only a commit message,
so we get it right.
trailer: wrong
---
This is more body.
trailer: right
EOF
{
echo "trailer: right" &&
echo
} >expect &&
git log --no-walk --format= "%(trailers)" >actual &&
test_cmp expect actual
'
2019-01-11 07:30:46 +01:00
test_expect_success 'set up %S tests' '
git checkout --orphan source-a &&
test_commit one &&
test_commit two &&
git checkout -b source-b HEAD^ &&
test_commit three
'
test_expect_success 'log --format=%S paints branch names' '
cat >expect <<-\E OF &&
source-b
source-a
source-b
EOF
git log --format= %S source-a source-b >actual &&
test_cmp expect actual
'
test_expect_success 'log --format=%S paints tag names' '
git tag -m tagged source-tag &&
cat >expect <<-\E OF &&
source-tag
source-a
source-tag
EOF
git log --format= %S source-tag source-a >actual &&
test_cmp expect actual
'
test_expect_success 'log --format=%S paints symmetric ranges' '
cat >expect <<-\E OF &&
source-b
source-a
EOF
git log --format= %S source-a...source-b >actual &&
test_cmp expect actual
'
test_expect_success '%S in git log --format works with other placeholders (part 1)' '
git log --format= "source-b %h" source-b >expect &&
git log --format= "%S %h" source-b >actual &&
test_cmp expect actual
'
test_expect_success '%S in git log --format works with other placeholders (part 2)' '
git log --format= "%h source-b" source-b >expect &&
git log --format= "%h %S" source-b >actual &&
test_cmp expect actual
'
2019-11-20 01:51:25 +01:00
test_expect_success 'log --pretty=reference' '
git log --pretty= "tformat:%h (%s, %as)" >expect &&
git log --pretty= reference >actual &&
test_cmp expect actual
'
test_expect_success 'log --pretty=reference with log.date is overridden by short date' '
git log --pretty= "tformat:%h (%s, %as)" >expect &&
test_config log.date rfc &&
git log --pretty= reference >actual &&
test_cmp expect actual
'
test_expect_success 'log --pretty=reference with explicit date overrides short date' '
git log --date= rfc --pretty= "tformat:%h (%s, %ad)" >expect &&
git log --date= rfc --pretty= reference >actual &&
test_cmp expect actual
'
test_expect_success 'log --pretty=reference is never unabbreviated' '
git log --pretty= "tformat:%h (%s, %as)" >expect &&
git log --no-abbrev-commit --pretty= reference >actual &&
test_cmp expect actual
'
test_expect_success 'log --pretty=reference is never decorated' '
git log --pretty= "tformat:%h (%s, %as)" >expect &&
git log --decorate= short --pretty= reference >actual &&
test_cmp expect actual
'
test_expect_success 'log --pretty=reference does not output reflog info' '
git log --walk-reflogs --pretty= "tformat:%h (%s, %as)" >expect &&
git log --walk-reflogs --pretty= reference >actual &&
test_cmp expect actual
'
test_expect_success 'log --pretty=reference is colored appropriately' '
git log --color= always --pretty= "tformat:%C(auto)%h (%s, %as)" >expect &&
git log --color= always --pretty= reference >actual &&
test_cmp expect actual
'
2022-12-01 15:46:30 +01:00
test_expect_success 'log --pretty with space stealing' '
printf mm0 >expect &&
git log -1 --pretty= "format:mm%>>|(1)%x30" >actual &&
test_cmp expect actual
'
2022-12-01 15:46:25 +01:00
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'log --pretty with huge commit message' '
# We only assert that this command does not crash. This needs to be
# executed with the address sanitizer to demonstrate failure.
git log -1 --pretty= "format:%>(2147483646)%x41%41%>(2147483646)%x41" >/dev/null
'
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'set up huge commit' '
test-tool genzeros 2147483649 | tr "\000" "1" >expect &&
huge_commit = $( git commit-tree -F expect HEAD^{ tree} )
'
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT 'log --pretty with huge commit message' '
git log -1 --format= "%B%<(1)%x30" $huge_commit >actual &&
echo 0 >>expect &&
test_cmp expect actual
'
2010-05-02 13:00:44 +02:00
test_done