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

Re: [PATCH] merge: allow fast-forward when merging a tracked tag

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 16, 2018, 18:06 UTC
Message-ID
<xmqqa7w87qsn.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CAPig+cSJKDH=_-hGZLpZUjC4WEyjMRAd2VPgo-Vd+sHpa4jQ-Q@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
Show 23 quoted lines
>> +       tag_ref = xstrfmt("refs/tags/%s",
>> +                         ((struct tag *)merge_remote_util(commit)->obj)->tag);
>
> xstrfmt() allocates a new string...
>
>> +       if (!read_ref(tag_ref, &oid) &&
>> +           !oidcmp(&oid, &merge_remote_util(commit)->obj->oid))
>> +               return 0;
>
> ...which is leaked here...
>
>> +
>> +       /*
>> +        * Otherwise, we are playing an integrator's role, making a
>> +        * merge with a throw-away tag from a contributor with
>> +        * something like "git pull $contributor $signed_tag".
>> +        * We want to forbid such a merge from fast-forwarding
>> +        * by default; otherwise we would not keep the signature
>> +        * anywhere.
>> +        */
>> +       return 1;
>
> ...and here.
OK.  Thanks.
Previous: Eric SunshineNext: Junio C Hamano
Message 14 of 15 in “Re: linux-next: unnecessary merge in the v4l-dvb tree”
  1. Linus TorvaldsFeb 12, 2018
  2. Mauro Carvalho ChehabFeb 12, 2018
  3. Junio C HamanoFeb 12, 2018
  4. Linus TorvaldsFeb 12, 2018
  5. Junio C HamanoFeb 12, 2018
  6. Linus TorvaldsFeb 12, 2018
  7. Junio C HamanoFeb 12, 2018
  8. Mauro Carvalho ChehabFeb 13, 2018
  9. Junio C HamanoFeb 13, 2018
  10. Linus TorvaldsFeb 13, 2018
  11. Junio C HamanoFeb 14, 2018
  12. merge: allow fast-forward when merging a tracked tagJunio C Hamano, Feb 15, 2018
  13. Eric SunshineFeb 15, 2018
  14. Junio C HamanoFeb 16, 2018
  15. merge: allow fast-forward when merging a tracked tagJunio C Hamano, Feb 16, 2018

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.