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

Re: [PATCH] notes: allow merging from arbitrary references

From
Jeff King <peff@peff.net>
Date
Nov 24, 2015, 22:47 UTC
Message-ID
<20151124224709.GA13691@sigill.intra.peff.net>
In-Reply-To
<1447432462-21192-1-git-send-email-jacob.e.keller@intel.com>
On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote:
> ---
> I do not remember what version this was since it has been an age ago
> that I sent the previous code. This is mostly just a rebase onto current
> next. I believe I have covered everything previous reviewers noted.

Please keep topics branched from master where possible. And if not possible, please indicate which topic in 'next' is required to build on.

We never merge 'next' itself, only individual topics from it. So I can't just apply your patch on top of 'next'.

I did get it to apply on the current master with "am -3", but some tests in t3310 seem to fail. Can you take a look?

I skimmed the discussion with Johan that followed this. Are we happy with this as a first step, or would people rather look at re-working the notes-ref lookups everywhere?

-Peff
Previous: Jacob KellerNext: Jeff King
Message 8 of 12 in “notes: allow merging from arbitrary references”
  1. notes: allow merging from arbitrary referencesJacob Keller, Nov 13, 2015
  2. Johan HerlandNov 15, 2015
  3. Jacob KellerNov 15, 2015
  4. Johan HerlandNov 16, 2015
  5. Jacob KellerNov 16, 2015
  6. Johan HerlandNov 18, 2015
  7. Jacob KellerNov 18, 2015
  8. Jeff KingNov 24, 2015
  9. Jeff KingNov 24, 2015
  10. Jacob KellerNov 26, 2015
  11. Junio C HamanoDec 11, 2015
  12. Jacob KellerDec 11, 2015

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.