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

Re: [PATCH] Document --ignore-if-in-upstream in git-format-patch

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 18, 2007, 13:40 UTC
Message-ID
<Pine.LNX.4.63.0701181437200.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<8764b4fuc8.fsf@morpheus.local>
Hi,
On Thu, 18 Jan 2007, David Kågedal wrote:
> Someone who knows how it *actually* works is encouraged to send a
> better explanation.
Nice try... Unfortunately, I don't have time to do it.
> +--ignore-if-in-upstream::
> +	Do not include the same patch twice.  If there are two commits
> +	that would produce identical patches, the second one is
> +	excluded from the output.
This is not what it does, though. (If in doubt, use the source, Luke).

Given a range upstream..localbranch, --ignore-if-in-upstream looks at all diffs associated with commits in localbranch..upstream (i.e. all commits upstream has, but not localbranch), and when traversing upstream..localbranch to output the commits with diffs, drops those at the floor which were already seen in localbranch..upstream.

The way it does this is by hashing the diffs, and check only the hashes.

Ciao, Dscho

Previous: David KågedalNext: David Kågedal
Message 2 of 5 in “Document --ignore-if-in-upstream in git-format-patch”
  1. Document --ignore-if-in-upstream in git-format-patchDavid Kågedal, Jan 18, 2007
  2. Johannes SchindelinJan 18, 2007
  3. David KågedalJan 18, 2007
  4. Johannes SchindelinJan 18, 2007
  5. Junio C HamanoJan 19, 2007

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.