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

Re: Transfer notes when rebasing

From
Jeff King <peff@peff.net>
Date
Sep 4, 2013, 08:49 UTC
Message-ID
<20130904084945.GA22470@sigill.intra.peff.net>
In-Reply-To
<CAC9WiBg+0PkEeBst6sw5uuCb4-21=zj+XCcjwKWSfAYi-ciqDA@mail.gmail.com>
On Wed, Sep 04, 2013 at 10:47:22AM +0200, Francis Moreau wrote:
Show 9 quoted lines
> > However, if the commit is dropped because we find while applying that it
> > becomes empty, there is not much we can do. It may have been obsoleted
> > by its counterpart patch that had a different patch-id, or it may even
> > have been obsoleted by unrelated patches. In the latter case, there is
> > nothing to copy to. In the former, you would have to trying to match up
> > the commit messages or similar to guess that the two commits correspond.
> 
> Can't git-rebase at least handle the case where a patch and its
> counterpart have the same patch-id ?

Certainly it could. My point was only that it doesn't currently (and it does not even know what the counterpart is, only that there is one).

> Also maybe git-rebase should warn when dropping a commit having a note
> to tell the user that the note is dropped too.

That might end up annoying, depending on what you use notes for. But I think if it were restricted to notes that would be rewritten via notes.rewriteRef, it probably makes sense.

Patches welcome.
-Peff
Previous: Francis Moreau
Message 7 of 7 in “Transfer notes when rebasing”
  1. Francis MoreauSep 4, 2013
  2. Jeff KingSep 4, 2013
  3. John KeepingSep 4, 2013
  4. Francis MoreauSep 4, 2013
  5. Jeff KingSep 4, 2013
  6. Francis MoreauSep 4, 2013
  7. Jeff KingSep 4, 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.