mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
fafd38299b
The correct output would have NUL after each commit, so "-z --format=%s" would have a single-liner subject with the line-terminating LF replaced with NUL, and "-p/--stat -z --format=%s" would have a single-liner subject with its line-terminating LF, followed by the diff/diffstat in which the terminating LF of the last line is replaced with NUL, but to be consistent with what "-p/--stat -z --pretty=format:%s" does, I think it is OK to append NUL to the diff/diffstat part instead of replacing its last LF with NUL. The added test shows the update is still not right for "-p -z --format". Signed-off-by: Junio C Hamano <gitster@pobox.com>
102 lines
2.7 KiB
Bash
Executable file
102 lines
2.7 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 --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_cmp expected actual
|
|
'
|
|
|
|
test_expect_failure 'NUL termination with --stat' '
|
|
stat0_part=$(git diff --stat HEAD^ HEAD) &&
|
|
stat1_part=$(git diff --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_cmp expected actual
|
|
'
|
|
|
|
test_done
|