mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
7abcbcb7ea
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in `{...}` groups in order to reduce the number of
possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1564 lines
39 KiB
Bash
Executable File
1564 lines
39 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2013, 2014 Christian Couder
|
|
#
|
|
|
|
test_description='git interpret-trailers'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# When we want one trailing space at the end of each line, let's use sed
|
|
# to make sure that these spaces are not removed by any automatic tool.
|
|
|
|
test_expect_success 'setup' '
|
|
: >empty &&
|
|
cat >basic_message <<-\EOF &&
|
|
subject
|
|
|
|
body
|
|
EOF
|
|
cat >complex_message_body <<-\EOF &&
|
|
my subject
|
|
|
|
my body which is long
|
|
and contains some special
|
|
chars like : = ? !
|
|
|
|
EOF
|
|
sed -e "s/ Z\$/ /" >complex_message_trailers <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by: Z
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
EOF
|
|
cat >basic_patch <<-\EOF
|
|
---
|
|
foo.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/foo.txt b/foo.txt
|
|
index 0353767..1d91aa1 100644
|
|
--- a/foo.txt
|
|
+++ b/foo.txt
|
|
@@ -1,3 +1,3 @@
|
|
|
|
-bar
|
|
+baz
|
|
|
|
--
|
|
1.9.rc0.11.ga562ddc
|
|
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'with cmd' '
|
|
test_when_finished "git config --remove-section trailer.bug" &&
|
|
git config trailer.bug.key "Bug-maker: " &&
|
|
git config trailer.bug.ifExists "add" &&
|
|
git config trailer.bug.cmd "echo \"maybe is\"" &&
|
|
cat >expected2 <<-EOF &&
|
|
|
|
Bug-maker: maybe is him
|
|
Bug-maker: maybe is me
|
|
EOF
|
|
git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
|
|
>actual2 &&
|
|
test_cmp expected2 actual2
|
|
'
|
|
|
|
test_expect_success 'with cmd and $1' '
|
|
test_when_finished "git config --remove-section trailer.bug" &&
|
|
git config trailer.bug.key "Bug-maker: " &&
|
|
git config trailer.bug.ifExists "add" &&
|
|
git config trailer.bug.cmd "echo \"\$1\" is" &&
|
|
cat >expected2 <<-EOF &&
|
|
|
|
Bug-maker: him is him
|
|
Bug-maker: me is me
|
|
EOF
|
|
git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
|
|
>actual2 &&
|
|
test_cmp expected2 actual2
|
|
'
|
|
|
|
test_expect_success 'with cmd and $1 with sh -c' '
|
|
test_when_finished "git config --remove-section trailer.bug" &&
|
|
git config trailer.bug.key "Bug-maker: " &&
|
|
git config trailer.bug.ifExists "replace" &&
|
|
git config trailer.bug.cmd "sh -c \"echo who is \"\$1\"\"" &&
|
|
cat >expected2 <<-EOF &&
|
|
|
|
Bug-maker: who is me
|
|
EOF
|
|
git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
|
|
>actual2 &&
|
|
test_cmp expected2 actual2
|
|
'
|
|
|
|
test_expect_success 'with cmd and $1 with shell script' '
|
|
test_when_finished "git config --remove-section trailer.bug" &&
|
|
git config trailer.bug.key "Bug-maker: " &&
|
|
git config trailer.bug.ifExists "replace" &&
|
|
git config trailer.bug.cmd "./echoscript" &&
|
|
cat >expected2 <<-EOF &&
|
|
|
|
Bug-maker: who is me
|
|
EOF
|
|
cat >echoscript <<-EOF &&
|
|
#!/bin/sh
|
|
echo who is "\$1"
|
|
EOF
|
|
chmod +x echoscript &&
|
|
git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
|
|
>actual2 &&
|
|
test_cmp expected2 actual2
|
|
'
|
|
|
|
test_expect_success 'without config' '
|
|
sed -e "s/ Z\$/ /" >expected <<-\EOF &&
|
|
|
|
ack: Peff
|
|
Reviewed-by: Z
|
|
Acked-by: Johan
|
|
EOF
|
|
git interpret-trailers --trailer "ack = Peff" --trailer "Reviewed-by" \
|
|
--trailer "Acked-by: Johan" empty >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'without config in another order' '
|
|
sed -e "s/ Z\$/ /" >expected <<-\EOF &&
|
|
|
|
Acked-by: Johan
|
|
Reviewed-by: Z
|
|
ack: Peff
|
|
EOF
|
|
git interpret-trailers --trailer "Acked-by: Johan" --trailer "Reviewed-by" \
|
|
--trailer "ack = Peff" empty >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success '--trim-empty without config' '
|
|
cat >expected <<-\EOF &&
|
|
|
|
ack: Peff
|
|
Acked-by: Johan
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer ack=Peff \
|
|
--trailer "Reviewed-by" --trailer "Acked-by: Johan" \
|
|
--trailer "sob:" empty >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with config option on the command line' '
|
|
cat >expected <<-\EOF &&
|
|
|
|
Acked-by: Johan
|
|
Reviewed-by: Peff
|
|
EOF
|
|
{ echo && echo "Acked-by: Johan"; } |
|
|
git -c "trailer.Acked-by.ifexists=addifdifferent" interpret-trailers \
|
|
--trailer "Reviewed-by: Peff" --trailer "Acked-by: Johan" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with only a title in the message' '
|
|
cat >expected <<-\EOF &&
|
|
area: change
|
|
|
|
Reviewed-by: Peff
|
|
Acked-by: Johan
|
|
EOF
|
|
echo "area: change" |
|
|
git interpret-trailers --trailer "Reviewed-by: Peff" \
|
|
--trailer "Acked-by: Johan" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with multiline title in the message' '
|
|
cat >expected <<-\EOF &&
|
|
place of
|
|
code: change
|
|
|
|
Reviewed-by: Peff
|
|
Acked-by: Johan
|
|
EOF
|
|
printf "%s\n" "place of" "code: change" |
|
|
git interpret-trailers --trailer "Reviewed-by: Peff" \
|
|
--trailer "Acked-by: Johan" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with non-trailer lines mixed with Signed-off-by' '
|
|
cat >patch <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
Signed-off-by: a <a@example.com>
|
|
this is not a trailer
|
|
EOF
|
|
cat >expected <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
Signed-off-by: a <a@example.com>
|
|
this is not a trailer
|
|
token: value
|
|
EOF
|
|
git interpret-trailers --trailer "token: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with non-trailer lines mixed with cherry picked from' '
|
|
cat >patch <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
(cherry picked from commit x)
|
|
this is not a trailer
|
|
EOF
|
|
cat >expected <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
(cherry picked from commit x)
|
|
this is not a trailer
|
|
token: value
|
|
EOF
|
|
git interpret-trailers --trailer "token: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with non-trailer lines mixed with a configured trailer' '
|
|
cat >patch <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
My-trailer: x
|
|
this is not a trailer
|
|
EOF
|
|
cat >expected <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
My-trailer: x
|
|
this is not a trailer
|
|
token: value
|
|
EOF
|
|
test_config trailer.my.key "My-trailer: " &&
|
|
git interpret-trailers --trailer "token: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with non-trailer lines mixed with a non-configured trailer' '
|
|
cat >patch <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
I-am-not-configured: x
|
|
this is not a trailer
|
|
EOF
|
|
cat >expected <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
this is not a trailer
|
|
I-am-not-configured: x
|
|
this is not a trailer
|
|
|
|
token: value
|
|
EOF
|
|
test_config trailer.my.key "My-trailer: " &&
|
|
git interpret-trailers --trailer "token: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with all non-configured trailers' '
|
|
cat >patch <<-\EOF &&
|
|
|
|
I-am-not-configured: x
|
|
I-am-also-not-configured: x
|
|
EOF
|
|
cat >expected <<-\EOF &&
|
|
|
|
I-am-not-configured: x
|
|
I-am-also-not-configured: x
|
|
token: value
|
|
EOF
|
|
test_config trailer.my.key "My-trailer: " &&
|
|
git interpret-trailers --trailer "token: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with non-trailer lines only' '
|
|
cat >patch <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
EOF
|
|
cat >expected <<-\EOF &&
|
|
|
|
this is not a trailer
|
|
|
|
token: value
|
|
EOF
|
|
git interpret-trailers --trailer "token: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'line with leading whitespace is not trailer' '
|
|
q_to_tab >patch <<-\EOF &&
|
|
|
|
Qtoken: value
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
Qtoken: value
|
|
|
|
token: value
|
|
EOF
|
|
git interpret-trailers --trailer "token: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'multiline field treated as one trailer for 25% check' '
|
|
q_to_tab >patch <<-\EOF &&
|
|
|
|
Signed-off-by: a <a@example.com>
|
|
name: value on
|
|
Qmultiple lines
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
Signed-off-by: a <a@example.com>
|
|
name: value on
|
|
Qmultiple lines
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
this is not a trailer
|
|
name: value
|
|
EOF
|
|
git interpret-trailers --trailer "name: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'multiline field treated as atomic for placement' '
|
|
q_to_tab >patch <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: value on
|
|
Qmultiple lines
|
|
another: trailer
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: value on
|
|
Qmultiple lines
|
|
name: value
|
|
another: trailer
|
|
EOF
|
|
test_config trailer.name.where after &&
|
|
git interpret-trailers --trailer "name: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'multiline field treated as atomic for replacement' '
|
|
q_to_tab >patch <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: value on
|
|
Qmultiple lines
|
|
another: trailer
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
another: trailer
|
|
another: trailer
|
|
name: value
|
|
EOF
|
|
test_config trailer.name.ifexists replace &&
|
|
git interpret-trailers --trailer "name: value" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'multiline field treated as atomic for difference check' '
|
|
q_to_tab >patch <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: first line
|
|
Qsecond line
|
|
another: trailer
|
|
EOF
|
|
test_config trailer.name.ifexists addIfDifferent &&
|
|
|
|
q_to_tab >trailer <<-\EOF &&
|
|
name: first line
|
|
Qsecond line
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: first line
|
|
Qsecond line
|
|
another: trailer
|
|
EOF
|
|
git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
|
|
test_cmp expected actual &&
|
|
|
|
q_to_tab >trailer <<-\EOF &&
|
|
name: first line
|
|
QQQQQsecond line
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: first line
|
|
Qsecond line
|
|
another: trailer
|
|
name: first line
|
|
QQQQQsecond line
|
|
EOF
|
|
git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
|
|
test_cmp expected actual &&
|
|
|
|
q_to_tab >trailer <<-\EOF &&
|
|
name: first line *DIFFERENT*
|
|
Qsecond line
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: first line
|
|
Qsecond line
|
|
another: trailer
|
|
name: first line *DIFFERENT*
|
|
Qsecond line
|
|
EOF
|
|
git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'multiline field treated as atomic for neighbor check' '
|
|
q_to_tab >patch <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: first line
|
|
Qsecond line
|
|
another: trailer
|
|
EOF
|
|
test_config trailer.name.where after &&
|
|
test_config trailer.name.ifexists addIfDifferentNeighbor &&
|
|
|
|
q_to_tab >trailer <<-\EOF &&
|
|
name: first line
|
|
Qsecond line
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: first line
|
|
Qsecond line
|
|
another: trailer
|
|
EOF
|
|
git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
|
|
test_cmp expected actual &&
|
|
|
|
q_to_tab >trailer <<-\EOF &&
|
|
name: first line
|
|
QQQQQsecond line
|
|
EOF
|
|
q_to_tab >expected <<-\EOF &&
|
|
|
|
another: trailer
|
|
name: first line
|
|
Qsecond line
|
|
name: first line
|
|
QQQQQsecond line
|
|
another: trailer
|
|
EOF
|
|
git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with config setup' '
|
|
git config trailer.ack.key "Acked-by: " &&
|
|
cat >expected <<-\EOF &&
|
|
|
|
Acked-by: Peff
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer "ack = Peff" empty >actual &&
|
|
test_cmp expected actual &&
|
|
git interpret-trailers --trim-empty --trailer "Acked-by = Peff" empty >actual &&
|
|
test_cmp expected actual &&
|
|
git interpret-trailers --trim-empty --trailer "Acked-by :Peff" empty >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with config setup and ":=" as separators' '
|
|
git config trailer.separators ":=" &&
|
|
git config trailer.ack.key "Acked-by= " &&
|
|
cat >expected <<-\EOF &&
|
|
|
|
Acked-by= Peff
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer "ack = Peff" empty >actual &&
|
|
test_cmp expected actual &&
|
|
git interpret-trailers --trim-empty --trailer "Acked-by= Peff" empty >actual &&
|
|
test_cmp expected actual &&
|
|
git interpret-trailers --trim-empty --trailer "Acked-by : Peff" empty >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with config setup and "%" as separators' '
|
|
git config trailer.separators "%" &&
|
|
cat >expected <<-\EOF &&
|
|
|
|
bug% 42
|
|
count% 10
|
|
bug% 422
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer "bug = 42" \
|
|
--trailer count%10 --trailer "test: stuff" \
|
|
--trailer "bug % 422" empty >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with "%" as separators and a message with trailers' '
|
|
cat >special_message <<-\EOF &&
|
|
Special Message
|
|
|
|
bug% 42
|
|
count% 10
|
|
bug% 422
|
|
EOF
|
|
cat >expected <<-\EOF &&
|
|
Special Message
|
|
|
|
bug% 42
|
|
count% 10
|
|
bug% 422
|
|
count% 100
|
|
EOF
|
|
git interpret-trailers --trailer count%100 \
|
|
special_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with config setup and ":=#" as separators' '
|
|
git config trailer.separators ":=#" &&
|
|
git config trailer.bug.key "Bug #" &&
|
|
cat >expected <<-\EOF &&
|
|
|
|
Bug #42
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer "bug = 42" empty >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with commit basic message' '
|
|
cat basic_message >expected &&
|
|
echo >>expected &&
|
|
git interpret-trailers <basic_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with basic patch' '
|
|
cat basic_message >input &&
|
|
cat basic_patch >>input &&
|
|
cat basic_message >expected &&
|
|
echo >>expected &&
|
|
cat basic_patch >>expected &&
|
|
git interpret-trailers <input >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with commit complex message as argument' '
|
|
cat complex_message_body complex_message_trailers >complex_message &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with 2 files arguments' '
|
|
cat basic_message >>expected &&
|
|
echo >>expected &&
|
|
cat basic_patch >>expected &&
|
|
git interpret-trailers complex_message input >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
# Cover multiple comment characters with the same test input.
|
|
for char in "#" ";"
|
|
do
|
|
case "$char" in
|
|
"#")
|
|
# This is the default, so let's explicitly _not_
|
|
# set any config to make sure it behaves as we expect.
|
|
;;
|
|
*)
|
|
config="-c core.commentChar=$char"
|
|
;;
|
|
esac
|
|
|
|
test_expect_success "with message that has comments ($char)" '
|
|
cat basic_message >message_with_comments &&
|
|
sed -e "s/ Z\$/ /" \
|
|
-e "s/#/$char/g" >>message_with_comments <<-EOF &&
|
|
# comment
|
|
|
|
# other comment
|
|
Cc: Z
|
|
# yet another comment
|
|
Reviewed-by: Johan
|
|
Reviewed-by: Z
|
|
# last comment
|
|
|
|
EOF
|
|
cat basic_patch >>message_with_comments &&
|
|
cat basic_message >expected &&
|
|
sed -e "s/#/$char/g" >>expected <<-\EOF &&
|
|
# comment
|
|
|
|
Reviewed-by: Johan
|
|
Cc: Peff
|
|
# last comment
|
|
|
|
EOF
|
|
cat basic_patch >>expected &&
|
|
git $config interpret-trailers \
|
|
--trim-empty --trailer "Cc: Peff" \
|
|
message_with_comments >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
done
|
|
|
|
test_expect_success 'with message that has an old style conflict block' '
|
|
cat basic_message >message_with_comments &&
|
|
sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
|
|
# comment
|
|
|
|
# other comment
|
|
Cc: Z
|
|
# yet another comment
|
|
Reviewed-by: Johan
|
|
Reviewed-by: Z
|
|
# last comment
|
|
|
|
Conflicts:
|
|
|
|
EOF
|
|
cat basic_message >expected &&
|
|
cat >>expected <<-\EOF &&
|
|
# comment
|
|
|
|
Reviewed-by: Johan
|
|
Cc: Peff
|
|
# last comment
|
|
|
|
Conflicts:
|
|
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with commit complex message and trailer args' '
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
Acked-by= Peff
|
|
Bug #42
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "bug: 42" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with complex patch, args and --trim-empty' '
|
|
cat complex_message >complex_patch &&
|
|
cat basic_patch >>complex_patch &&
|
|
cat complex_message_body >expected &&
|
|
cat >>expected <<-\EOF &&
|
|
Acked-by= Peff
|
|
Bug #42
|
|
EOF
|
|
cat basic_patch >>expected &&
|
|
git interpret-trailers --trim-empty --trailer "ack: Peff" \
|
|
--trailer "bug: 42" <complex_patch >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'in-place editing with basic patch' '
|
|
cat basic_message >message &&
|
|
cat basic_patch >>message &&
|
|
cat basic_message >expected &&
|
|
echo >>expected &&
|
|
cat basic_patch >>expected &&
|
|
git interpret-trailers --in-place message &&
|
|
test_cmp expected message
|
|
'
|
|
|
|
test_expect_success 'in-place editing with additional trailer' '
|
|
cat basic_message >message &&
|
|
cat basic_patch >>message &&
|
|
cat basic_message >expected &&
|
|
echo >>expected &&
|
|
cat >>expected <<-\EOF &&
|
|
Reviewed-by: Alice
|
|
EOF
|
|
cat basic_patch >>expected &&
|
|
git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
|
|
test_cmp expected message
|
|
'
|
|
|
|
test_expect_success 'in-place editing on stdin disallowed' '
|
|
test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place < basic_message
|
|
'
|
|
|
|
test_expect_success 'in-place editing on non-existing file' '
|
|
test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place nonexisting &&
|
|
test_path_is_missing nonexisting
|
|
'
|
|
|
|
test_expect_success POSIXPERM,SANITY "in-place editing doesn't clobber original file on error" '
|
|
cat basic_message >message &&
|
|
chmod -r message &&
|
|
test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
|
|
chmod +r message &&
|
|
test_cmp message basic_message
|
|
'
|
|
|
|
test_expect_success 'using "where = before"' '
|
|
git config trailer.bug.where "before" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
Acked-by= Peff
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "bug: 42" complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'overriding configuration with "--where after"' '
|
|
git config trailer.ack.where "before" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --where after --trailer "ack: Peff" \
|
|
complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "where = before" with "--no-where"' '
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Peff
|
|
Acked-by= Z
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --where after --no-where --trailer "ack: Peff" \
|
|
--trailer "bug: 42" complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "where = after"' '
|
|
git config trailer.ack.where "after" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "bug: 42" complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "where = end"' '
|
|
git config trailer.review.key "Reviewed-by" &&
|
|
git config trailer.review.where "end" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
Reviewed-by: Junio
|
|
Reviewed-by: Johannes
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "Reviewed-by: Junio" --trailer "Reviewed-by: Johannes" \
|
|
complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "where = start"' '
|
|
git config trailer.review.key "Reviewed-by" &&
|
|
git config trailer.review.where "start" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Reviewed-by: Johannes
|
|
Reviewed-by: Junio
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Reviewed-by: Z
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "Reviewed-by: Junio" --trailer "Reviewed-by: Johannes" \
|
|
complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "where = before" for a token in the middle of the message' '
|
|
git config trailer.review.key "Reviewed-by:" &&
|
|
git config trailer.review.where "before" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Reviewed-by:Johan
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" --trailer "bug: 42" \
|
|
--trailer "review: Johan" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "where = before" and --trim-empty' '
|
|
cat complex_message_body >expected &&
|
|
cat >>expected <<-\EOF &&
|
|
Bug #46
|
|
Bug #42
|
|
Acked-by= Peff
|
|
Reviewed-by:Johan
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer "ack: Peff" \
|
|
--trailer "bug: 42" --trailer "review: Johan" \
|
|
--trailer "Bug: 46" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'the default is "ifExists = addIfDifferentNeighbor"' '
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
|
|
--trailer "ack: Junio" --trailer "bug: 42" --trailer "ack: Peff" \
|
|
--trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'default "ifExists" is now "addIfDifferent"' '
|
|
git config trailer.ifexists "addIfDifferent" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Acked-by= Junio
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
|
|
--trailer "ack: Junio" --trailer "bug: 42" --trailer "ack: Peff" \
|
|
--trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = addIfDifferent" with "where = end"' '
|
|
git config trailer.ack.ifExists "addIfDifferent" &&
|
|
git config trailer.ack.where "end" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Acked-by= Peff
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
|
|
--trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = addIfDifferent" with "where = before"' '
|
|
git config trailer.ack.ifExists "addIfDifferent" &&
|
|
git config trailer.ack.where "before" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Peff
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
|
|
--trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = addIfDifferentNeighbor" with "where = end"' '
|
|
git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
|
|
git config trailer.ack.where "end" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Acked-by= Peff
|
|
Acked-by= Junio
|
|
Tested-by: Jakub
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
|
|
--trailer "ack: Junio" --trailer "bug: 42" \
|
|
--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
|
|
--trailer "ack: Junio" --trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = addIfDifferentNeighbor" with "where = after"' '
|
|
git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
|
|
git config trailer.ack.where "after" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Tested-by: Jakub
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
|
|
--trailer "ack: Junio" --trailer "bug: 42" \
|
|
--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
|
|
--trailer "ack: Junio" --trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = addIfDifferentNeighbor" and --trim-empty' '
|
|
git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
|
|
cat complex_message_body >expected &&
|
|
cat >>expected <<-\EOF &&
|
|
Bug #42
|
|
Acked-by= Peff
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
EOF
|
|
git interpret-trailers --trim-empty --trailer "ack: Peff" \
|
|
--trailer "Acked-by= Peff" --trailer "review:" \
|
|
--trailer "ack: Junio" --trailer "bug: 42" \
|
|
--trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = add" with "where = end"' '
|
|
git config trailer.ack.ifExists "add" &&
|
|
git config trailer.ack.where "end" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Acked-by= Peff
|
|
Acked-by= Peff
|
|
Tested-by: Jakub
|
|
Acked-by= Junio
|
|
Tested-by: Johannes
|
|
Acked-by= Peff
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "Acked-by= Peff" --trailer "review:" \
|
|
--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
|
|
--trailer "bug: 42" --trailer "Tested-by: Johannes" \
|
|
--trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = add" with "where = after"' '
|
|
git config trailer.ack.ifExists "add" &&
|
|
git config trailer.ack.where "after" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Acked-by= Peff
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "Acked-by= Peff" --trailer "review:" \
|
|
--trailer "ack: Junio" --trailer "bug: 42" \
|
|
--trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'overriding configuration with "--if-exists replace"' '
|
|
git config trailer.fix.key "Fixes: " &&
|
|
git config trailer.fix.ifExists "add" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Fixes: 22
|
|
EOF
|
|
git interpret-trailers --if-exists replace --trailer "review:" \
|
|
--trailer "fix=53" --trailer "fix=22" --trailer "bug: 42" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = replace"' '
|
|
git config trailer.fix.key "Fixes: " &&
|
|
git config trailer.fix.ifExists "replace" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Fixes: 22
|
|
EOF
|
|
git interpret-trailers --trailer "review:" \
|
|
--trailer "fix=53" --trailer "ack: Junio" --trailer "fix=22" \
|
|
--trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = replace" with "where = after"' '
|
|
git config trailer.fix.where "after" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: 22
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "review:" \
|
|
--trailer "fix=53" --trailer "ack: Junio" --trailer "fix=22" \
|
|
--trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifExists = doNothing"' '
|
|
git config trailer.fix.ifExists "doNothing" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=53" \
|
|
--trailer "ack: Junio" --trailer "fix=22" \
|
|
--trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'the default is "ifMissing = add"' '
|
|
git config trailer.cc.key "Cc: " &&
|
|
git config trailer.cc.where "before" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Cc: Linus
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=53" \
|
|
--trailer "cc=Linus" --trailer "ack: Junio" \
|
|
--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'overriding configuration with "--if-missing doNothing"' '
|
|
git config trailer.ifmissing "add" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --if-missing doNothing \
|
|
--trailer "review:" --trailer "fix=53" \
|
|
--trailer "cc=Linus" --trailer "ack: Junio" \
|
|
--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'when default "ifMissing" is "doNothing"' '
|
|
git config trailer.ifmissing "doNothing" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=53" \
|
|
--trailer "cc=Linus" --trailer "ack: Junio" \
|
|
--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual &&
|
|
git config trailer.ifmissing "add"
|
|
'
|
|
|
|
test_expect_success 'using "ifMissing = add" with "where = end"' '
|
|
git config trailer.cc.key "Cc: " &&
|
|
git config trailer.cc.where "end" &&
|
|
git config trailer.cc.ifMissing "add" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Cc: Linus
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=53" \
|
|
--trailer "ack: Junio" --trailer "fix=22" \
|
|
--trailer "bug: 42" --trailer "cc=Linus" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifMissing = add" with "where = before"' '
|
|
git config trailer.cc.key "Cc: " &&
|
|
git config trailer.cc.where "before" &&
|
|
git config trailer.cc.ifMissing "add" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Cc: Linus
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=53" \
|
|
--trailer "ack: Junio" --trailer "fix=22" \
|
|
--trailer "bug: 42" --trailer "cc=Linus" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'using "ifMissing = doNothing"' '
|
|
git config trailer.cc.ifMissing "doNothing" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=53" \
|
|
--trailer "cc=Linus" --trailer "ack: Junio" \
|
|
--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'default "where" is now "after"' '
|
|
git config trailer.where "after" &&
|
|
git config --unset trailer.ack.where &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Bug #42
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Acked-by= Peff
|
|
Acked-by= Peff
|
|
Acked-by= Junio
|
|
Acked-by= Peff
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Tested-by: Jakub
|
|
Tested-by: Johannes
|
|
EOF
|
|
git interpret-trailers --trailer "ack: Peff" \
|
|
--trailer "Acked-by= Peff" --trailer "review:" \
|
|
--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
|
|
--trailer "bug: 42" --trailer "Tested-by: Johannes" \
|
|
--trailer "ack: Peff" <complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with simple command' '
|
|
git config trailer.sign.key "Signed-off-by: " &&
|
|
git config trailer.sign.where "after" &&
|
|
git config trailer.sign.ifExists "addIfDifferentNeighbor" &&
|
|
git config trailer.sign.command "echo \"A U Thor <author@example.com>\"" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=22" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with command using committer information' '
|
|
git config trailer.sign.ifExists "addIfDifferent" &&
|
|
git config trailer.sign.command "echo \"\$GIT_COMMITTER_NAME <\$GIT_COMMITTER_EMAIL>\"" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Signed-off-by: C O Mitter <committer@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=22" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with command using author information' '
|
|
git config trailer.sign.key "Signed-off-by: " &&
|
|
git config trailer.sign.where "after" &&
|
|
git config trailer.sign.ifExists "addIfDifferentNeighbor" &&
|
|
git config trailer.sign.command "echo \"\$GIT_AUTHOR_NAME <\$GIT_AUTHOR_EMAIL>\"" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=22" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'setup a commit' '
|
|
echo "Content of the first commit." > a.txt &&
|
|
git add a.txt &&
|
|
git commit -m "Add file a.txt"
|
|
'
|
|
|
|
test_expect_success 'cmd takes precedence over command' '
|
|
test_when_finished "git config --unset trailer.fix.cmd" &&
|
|
git config trailer.fix.ifExists "replace" &&
|
|
git config trailer.fix.cmd "test -n \"\$1\" && git log -1 --oneline --format=\"%h (%aN)\" \
|
|
--abbrev-commit --abbrev=14 \"\$1\" || true" &&
|
|
git config trailer.fix.command "git log -1 --oneline --format=\"%h (%s)\" \
|
|
--abbrev-commit --abbrev=14 \$ARG" &&
|
|
FIXED=$(git log -1 --oneline --format="%h (%aN)" --abbrev-commit --abbrev=14 HEAD) &&
|
|
cat complex_message_body >expected2 &&
|
|
sed -e "s/ Z\$/ /" >>expected2 <<-EOF &&
|
|
Fixes: $FIXED
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
|
|
<complex_message >actual2 &&
|
|
test_cmp expected2 actual2
|
|
'
|
|
|
|
test_expect_success 'with command using $ARG' '
|
|
git config trailer.fix.ifExists "replace" &&
|
|
git config trailer.fix.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG" &&
|
|
FIXED=$(git log -1 --oneline --format="%h (%s)" --abbrev-commit --abbrev=14 HEAD) &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-EOF &&
|
|
Fixes: $FIXED
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with failing command using $ARG' '
|
|
git config trailer.fix.ifExists "replace" &&
|
|
git config trailer.fix.command "false \$ARG" &&
|
|
cat complex_message_body >expected &&
|
|
sed -e "s/ Z\$/ /" >>expected <<-EOF &&
|
|
Fixes: Z
|
|
Acked-by= Z
|
|
Reviewed-by:
|
|
Signed-off-by: Z
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
|
|
<complex_message >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with empty tokens' '
|
|
git config --unset trailer.fix.command &&
|
|
cat >expected <<-EOF &&
|
|
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer ":" --trailer ":test" >actual <<-EOF &&
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with command but no key' '
|
|
git config --unset trailer.sign.key &&
|
|
cat >expected <<-EOF &&
|
|
|
|
sign: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers >actual <<-EOF &&
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with no command and no key' '
|
|
git config --unset trailer.review.key &&
|
|
cat >expected <<-EOF &&
|
|
|
|
review: Junio
|
|
sign: A U Thor <author@example.com>
|
|
EOF
|
|
git interpret-trailers --trailer "review:Junio" >actual <<-EOF &&
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'with cut line' '
|
|
cat >expected <<-\EOF &&
|
|
my subject
|
|
|
|
review: Brian
|
|
sign: A U Thor <author@example.com>
|
|
# ------------------------ >8 ------------------------
|
|
ignore this
|
|
EOF
|
|
git interpret-trailers --trailer review:Brian >actual <<-\EOF &&
|
|
my subject
|
|
# ------------------------ >8 ------------------------
|
|
ignore this
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'only trailers' '
|
|
git config trailer.sign.command "echo config-value" &&
|
|
cat >expected <<-\EOF &&
|
|
existing: existing-value
|
|
sign: config-value
|
|
added: added-value
|
|
EOF
|
|
git interpret-trailers \
|
|
--trailer added:added-value \
|
|
--only-trailers >actual <<-\EOF &&
|
|
my subject
|
|
|
|
my body
|
|
|
|
existing: existing-value
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'only-trailers omits non-trailer in middle of block' '
|
|
git config trailer.sign.command "echo config-value" &&
|
|
cat >expected <<-\EOF &&
|
|
Signed-off-by: nobody <nobody@nowhere>
|
|
Signed-off-by: somebody <somebody@somewhere>
|
|
sign: config-value
|
|
EOF
|
|
git interpret-trailers --only-trailers >actual <<-\EOF &&
|
|
subject
|
|
|
|
it is important that the trailers below are signed-off-by
|
|
so that they meet the "25% trailers Git knows about" heuristic
|
|
|
|
Signed-off-by: nobody <nobody@nowhere>
|
|
this is not a trailer
|
|
Signed-off-by: somebody <somebody@somewhere>
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'only input' '
|
|
git config trailer.sign.command "echo config-value" &&
|
|
cat >expected <<-\EOF &&
|
|
existing: existing-value
|
|
EOF
|
|
git interpret-trailers \
|
|
--only-trailers --only-input >actual <<-\EOF &&
|
|
my subject
|
|
|
|
my body
|
|
|
|
existing: existing-value
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'unfold' '
|
|
cat >expected <<-\EOF &&
|
|
foo: continued across several lines
|
|
EOF
|
|
# pass through tr to make leading and trailing whitespace more obvious
|
|
tr _ " " <<-\EOF |
|
|
my subject
|
|
|
|
my body
|
|
|
|
foo:_
|
|
__continued
|
|
___across
|
|
____several
|
|
_____lines
|
|
___
|
|
EOF
|
|
git interpret-trailers --only-trailers --only-input --unfold >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'handling of --- lines in input' '
|
|
echo "real-trailer: just right" >expected &&
|
|
|
|
git interpret-trailers --parse >actual <<-\EOF &&
|
|
subject
|
|
|
|
body
|
|
|
|
not-a-trailer: too soon
|
|
------ this is just a line in the commit message with a bunch of
|
|
------ dashes; it does not have any syntactic meaning.
|
|
|
|
real-trailer: just right
|
|
---
|
|
below the dashed line may be a patch, etc.
|
|
|
|
not-a-trailer: too late
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'suppress --- handling' '
|
|
echo "real-trailer: just right" >expected &&
|
|
|
|
git interpret-trailers --parse --no-divider >actual <<-\EOF &&
|
|
subject
|
|
|
|
This commit message has a "---" in it, but because we tell
|
|
interpret-trailers not to respect that, it has no effect.
|
|
|
|
not-a-trailer: too soon
|
|
---
|
|
|
|
This is still the commit message body.
|
|
|
|
real-trailer: just right
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|