* Adding a line after the signed-off git am -s
@ 2019-10-11 14:43 Daniel Lezcano
2019-10-12 1:03 ` Junio C Hamano
2019-10-15 22:52 ` Beat Bolli
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Lezcano @ 2019-10-11 14:43 UTC (permalink / raw)
To: git
Hi all,
Is there a way to specify a line to be added in the change-log after the
SOB with git-am ?
I would like to do something:
git am -s -l "Link: https://lore.kernel.org/r/<msgid>"
Which will give:
blabla
Signed-off-by: author@kairnail.org
Signed-off-by: commiter@kairnail.org
Link: https://lore.kernel.org/r/<msgid>
This way it is compatible with patchwork, git-pw, etc...
Thanks in advance
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Adding a line after the signed-off git am -s
2019-10-11 14:43 Adding a line after the signed-off git am -s Daniel Lezcano
@ 2019-10-12 1:03 ` Junio C Hamano
2019-10-15 22:52 ` Beat Bolli
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2019-10-12 1:03 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: git
Daniel Lezcano <daniel.lezcano@linaro.org> writes:
> I would like to do something:
>
> git am -s -l "Link: https://lore.kernel.org/r/<msgid>"
>
> Which will give:
>
> blabla
>
> Signed-off-by: author@kairnail.org
> Signed-off-by: commiter@kairnail.org
> Link: https://lore.kernel.org/r/<msgid>
>
> This way it is compatible with patchwork, git-pw, etc...
There is the post-applypatch hook you can define after the patch
gets applied and produces a commit.
I use it to maintain the amlog notes in my repository (iow, I do not
amend the commit, but add notes to the resulting commit so that I
can tell, given a commit, which message resulted in it).
If you want to amend the resulting commit instead, the place to do
so would be where I call "git notes --ref amlog" in the sample
script.
-- >8 -- post-applypatch hook example -- >8 --
#!/bin/sh
GIT_DIR=.git
dotest="$GIT_DIR/rebase-apply"
prec=4 &&
this=$(cat 2>/dev/null "$dotest/next") &&
msgnum=$(printf "%0${prec}d" $this) &&
test -f "$dotest/$msgnum" &&
message_id=$(sed -ne '
/^[ ]/{
# Append continuation line to hold space
H
# Swap hold and pattern
x
# Remove the LF, making it a single line
s/\n//
# Swap hold and pattern back
x
# Discard the pattern and go on
n
}
# Hold this new line, and look at what is in the hold space
x
# Is it the Message-ID line? If so, spit it out and finish.
/^[Mm][Ee][Ss][Ss][Aa][Gg][Ee]-[Ii][Dd]:[ ]*/{
s///p
q
}
# Otherwise, check if this new line is empty
x
# Is it? Then we are done with the header
/^$/b end
# Otherwise we need to hold onto this header line
x
# And start the next cycle
b
: end
# ??? do we want to check if we held onto the last message-id line
# and process it here if we did???
q
' "$dotest/$msgnum") &&
if test -n "$message_id" &&
head=$(git rev-parse --verify HEAD 2>/dev/null)
then
echo "$head $message_id" >>"$GIT_DIR"/am.log &&
git notes --ref amlog add -f -m "Message-Id: $message_id" "$head"
fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Adding a line after the signed-off git am -s
2019-10-11 14:43 Adding a line after the signed-off git am -s Daniel Lezcano
2019-10-12 1:03 ` Junio C Hamano
@ 2019-10-15 22:52 ` Beat Bolli
2019-10-16 8:48 ` Daniel Lezcano
1 sibling, 1 reply; 4+ messages in thread
From: Beat Bolli @ 2019-10-15 22:52 UTC (permalink / raw)
To: Daniel Lezcano, git
On 11.10.19 16:43, Daniel Lezcano wrote:
>
> Hi all,
>
> Is there a way to specify a line to be added in the change-log after the
> SOB with git-am ?
>
> I would like to do something:
>
> git am -s -l "Link: https://lore.kernel.org/r/<msgid>"
>
> Which will give:
>
> blabla
>
> Signed-off-by: author@kairnail.org
> Signed-off-by: commiter@kairnail.org
> Link: https://lore.kernel.org/r/<msgid>
>
> This way it is compatible with patchwork, git-pw, etc...
I think something like
git interpret-trailer --trailer Link:https://lore.kernel.irg/r/msgid
<patch | git am -
should work.
Cheers,
Beat
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Adding a line after the signed-off git am -s
2019-10-15 22:52 ` Beat Bolli
@ 2019-10-16 8:48 ` Daniel Lezcano
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Lezcano @ 2019-10-16 8:48 UTC (permalink / raw)
To: Beat Bolli, git
On 16/10/2019 00:52, Beat Bolli wrote:
> On 11.10.19 16:43, Daniel Lezcano wrote:
>>
>> Hi all,
>>
>> Is there a way to specify a line to be added in the change-log after the
>> SOB with git-am ?
>>
>> I would like to do something:
>>
>> git am -s -l "Link: https://lore.kernel.org/r/<msgid>"
>>
>> Which will give:
>>
>> blabla
>>
>> Signed-off-by: author@kairnail.org
>> Signed-off-by: commiter@kairnail.org
>> Link: https://lore.kernel.org/r/<msgid>
>>
>> This way it is compatible with patchwork, git-pw, etc...
>
> I think something like
>
> git interpret-trailer --trailer Link:https://lore.kernel.irg/r/msgid
> <patch | git am -
>
> should work.
Thank you for the suggestion, I will try.
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-16 8:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-11 14:43 Adding a line after the signed-off git am -s Daniel Lezcano
2019-10-12 1:03 ` Junio C Hamano
2019-10-15 22:52 ` Beat Bolli
2019-10-16 8:48 ` Daniel Lezcano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.