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

Merging tags does not fast-forward with git 1.7.9

From
DADomenico Andreoli <cavokz@gmail.com>
Date
Feb 9, 2012, 09:54 UTC
Message-ID
<20120209095415.GA19230@glitch>
Hi,
  with the recent changes in tag merging (I updated git to 1.7.9),
my usual "git merge v3.X-rcY" command does not fast-forward any more.
Of course the initial head is something like "v3.X-rcZ" without any
change so that it should (and usually did) fast-forward to the new head.

The editor is instead fired off and I have to fill the details of a merge commit, diverging from mainline as soon as I save and exit.

Is there any simple and clear explanation for this? Thank you.

cheers, Domenico

ps: I admit I didn't follow the details about tag signatures so probably I missed something that I shouldn't.

Next: Dan Johnson
Message 1 of 7 in “Merging tags does not fast-forward with git 1.7.9”
  1. Domenico AndreoliFeb 9, 2012
  2. Dan JohnsonFeb 9, 2012
  3. Domenico AndreoliFeb 9, 2012
  4. Andreas SchwabFeb 9, 2012
  5. Carlos Martín NietoFeb 9, 2012
  6. Domenico AndreoliFeb 9, 2012
  7. Junio C HamanoFeb 9, 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.