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

Re: [PATCH 0/2] Feeding an annotated but unsigned tag to "git merge"

From
Jeff King <peff@peff.net>
Date
Jun 7, 2012, 09:09 UTC
Message-ID
<20120607090933.GB6087@sigill.intra.peff.net>
In-Reply-To
<7vzk8gmm5b.fsf@alter.siamese.dyndns.org>
On Wed, Jun 06, 2012 at 09:37:52AM -0700, Junio C Hamano wrote:
Show 8 quoted lines
> > This just doesn't make sense to me. Why would we treat annotated but
> > unsigned tags differently from signed tags? In both cases, the new
> > behavior is keeping more information about what happened, which is
> > generally a good thing.
> >
> > I haven't seen any good argument against creating these merges[1].
> 
> It is in line with --ff-only special casing, though.

Is it? My impression from reading b5c9f1c is that --ff-only trumps both annotated _and_ signed tags. Which makes sense to me. What I was objecting to is that "some tag objects are more equal than others". It's OK to treat unannotated tags differently from tag objects, but treating annotated but unsigned objects differently from signed objects seems unnecessary and complex.

> This was triggered by
> http://thread.gmane.org/gmane.comp.version-control.git/198828

The complaint in that thread mentions git's v1.7.10.2, which is signed, and therefore would not be impacted by change. But perhaps that was purely for illustrative purposes.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 7 in “Feeding an annotated but unsigned tag to "git merge"”
  1. 0/2 Feeding an annotated but unsigned tag to "git merge"Junio C Hamano, Jun 5, 2012
  2. 1/2 merge: separte the logic to check for a signed tagJunio C Hamano, Jun 5, 2012
  3. 2/2 merge: allow fast-forwarding to an annotated but unsigned tagJunio C Hamano, Jun 5, 2012
  4. Jeff KingJun 6, 2012
  5. Junio C HamanoJun 6, 2012
  6. Jeff KingJun 7, 2012
  7. Junio C HamanoJun 7, 2012

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.