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

Re: [PATCH v2] combine-diff: don't override recursive flag in diff_tree_combined()

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 5, 2025, 15:27 UTC
Message-ID
<xmqq5xdw537l.fsf@gitster.g>
In-Reply-To
<20250905-toon-fix-last-modified-v2-1-d859eeed408e@iotcl.com>
Toon Claes <toon@iotcl.com> writes:
> This patch is based on 'next' at 1ba7204a04 (Merge branch
> 'kh/doc-markup-fixes' into next, 2025-09-03).

Can't you be a bit more specific? We usually say "do not build on 'next'", but what we really mean by that statement are

 * Your topic may interact with some topics already in 'next', but
   it is unlikely that you depend on _all_ of them.  If you are
   willing to depend on a few selected topics (meaning: you accept
   that you have to adjust your topic when they get updated, and you
   accept that you cannot graduate before all of them graduate),
   identify them and build on the result of a merge of these topics
   into 'master'.  State how you constructed your base in your cover
   letter.
 * If you are truly depending on _everything_ in 'next', then stop.
   Wait until all of them graduates, and then submit your topic
   after that.
Thanks.
Previous: Toon ClaesNext: Kristoffer Haugsbakk
Message 2 of 9 in “combine-diff: don't override recursive flag in diff_tree_combined()”
  1. combine-diff: don't override recursive flag in diff_tree_combined()Toon Claes, Sep 5, 2025
  2. Junio C HamanoSep 5, 2025
  3. Kristoffer HaugsbakkSep 5, 2025
  4. Toon ClaesSep 8, 2025
  5. Patrick SteinhardtSep 16, 2025
  6. Toon ClaesSep 16, 2025
  7. Patrick SteinhardtSep 18, 2025
  8. last-modified: fix bug when some paths remain unhandledToon Claes, Sep 18, 2025
  9. Junio C HamanoSep 18, 2025

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.