git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Adding a line after the signed-off git am -s

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 12, 2019, 01:03 UTC
Message-ID
<xmqq7e5ag4g5.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<6797ef7d-5444-4c77-59e6-1d78fd3ccb0c@linaro.org>
Daniel Lezcano <daniel.lezcano@linaro.org> writes:
Show 13 quoted lines
> 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
Previous: Daniel LezcanoNext: Beat Bolli
Message 2 of 4 in “Adding a line after the signed-off git am -s”
  1. Daniel LezcanoOct 11, 2019
  2. Junio C HamanoOct 12, 2019
  3. Beat BolliOct 15, 2019
  4. Daniel LezcanoOct 16, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.