git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Fabian Stelzer <fs@gigacodes.de>, Junio C Hamano <gitster@pobox.com>
Cc: Git List Mailing <git@vger.kernel.org>
Subject: git ssh signing changed broke tag merge message contents
Date: Mon, 10 Jan 2022 08:42:07 -0800	[thread overview]
Message-ID: <CAHk-=whXPxWL7z3GiPkaDt+yygrRmagrYUnib7Lx=Vvrqx2ufg@mail.gmail.com> (raw)

So I made the mistake of updating my git tree as I started doing my
merge window for 5.17, and suddenly all the messages from signed tags
disappeared from the merge commits.

I bisected it to commit 02769437e1 ("ssh signing: use sigc struct to
pass payload"), but haven't done any other analysis.

I assume it's the change to fmt-merge-msg.c, but have no time to actually check.

Easy enough to test:

   echo "Dummy file" > dummy
   git commit -m "Dummy commit" dummy
   git tag -s -m "Dummy tag" dummy-tag
   git reset --hard HEAD^
   git merge --no-ff dummy-tag

With the above, you are *supposed* to get a merge message in your
editor something like

    Merge tag 'dummy-tag'

    Dummy tag

    * tag 'dummy-tag':
      Dummy commit

(ok, that last part you only get with merge.summary=true, of course)

But with the broken commit, that "Dummy tag" message from the tag
contents does not exist.

Holler if there are questions, but I'm hoping the above explanation is
clear enough since I'm about to be very busy..

                Linus

             reply	other threads:[~2022-01-10 16:42 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-10 16:42 Linus Torvalds [this message]
2022-01-10 17:19 ` git ssh signing changed broke tag merge message contents Taylor Blau
2022-01-10 17:22   ` Linus Torvalds
2022-01-10 17:31   ` Junio C Hamano
2022-01-10 21:19   ` [PATCH] fmt-merge-msg: prevent use-after-free with signed tags Taylor Blau
2022-01-10 21:38     ` Junio C Hamano
2022-01-11  8:41     ` Fabian Stelzer
2022-01-11 15:42       ` Taylor Blau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAHk-=whXPxWL7z3GiPkaDt+yygrRmagrYUnib7Lx=Vvrqx2ufg@mail.gmail.com' \
    --to=torvalds@linux-foundation.org \
    --cc=fs@gigacodes.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).