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

Re: "Already up-to-date!" merge isn't a no-op?

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 6, 2013, 22:08 UTC
Message-ID
<7v38w8p4fn.fsf@alter.siamese.dyndns.org>
In-Reply-To
<142915274.2151729.1362606487755.JavaMail.root@genarts.com>
Stephen Bash <bash@genarts.com> writes:
> So what is the actual meaning of "Already up-to-date!"?  Is it
> based on the tree, the reachable commits, or something more
> complicated?

The resulting tree of the merge happened to be the same as the original tree (i.e. "git diff HEAD^ HEAD" is empty).

This happens quite often and is perfectly normal. After merging topics that has been cooking in 'next' to 'master', merging the resulting 'master' to 'next' is likely to result in that situation, unless 'master' has gained some other changes, such as updating the draft release notes with a commit on it, or applying an obvious and trivial fix before cooking it in 'next'.

Previous: Stephen Bash
Message 2 of 2 in “"Already up-to-date!" merge isn't a no-op?”
  1. Stephen BashMar 6, 2013
  2. Junio C HamanoMar 6, 2013

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.