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

Re: [PATCH v2 1/2] check-ref-format --print: Normalize refnames that start with slashes

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 29, 2011, 20:56 UTC
Message-ID
<7vhb50543g.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110829190118.GE756@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 10 quoted lines
> On Mon, Aug 29, 2011 at 02:50:12PM -0400, Jeff King wrote:
>
>>   3. Having better tool support for comparing two sets of commits. The
>>      ideal interface (to me) for this workflow would be something like:
>
> BTW, this discussion is obviously about comparing what was applied
> upstream with what was submitted, but I think such a tool could have
> other purposes, too. It should be able to provide a much nicer interdiff
> between two versions of the same series (e.g., for reviewers looking at
> a re-roll).

I agree with it in principle, but I am not going to write one any time soon. I think the most difficult case is when the submitter based a fix on 'next' or 'pu' and I fixed it up so that it applies to 'maint'. It is not trivial to express conflict resolution in such a case, as what your tool has to do its work are (1) the original patch that may apply to "somewhere" (the tool could ask "am -3" to help it out), and (2) the patch that is queued somewhere in 'pu'.

Previous: Jeff KingNext: Jeff King
Message 8 of 14 in “Fix reference name format check and normalization”
  1. 0/2 Fix reference name format check and normalizationMichael Haggerty, Aug 27, 2011
  2. 1/2 check-ref-format --print: Normalize refnames that start with slashesMichael Haggerty, Aug 27, 2011
  3. Michael HaggertyAug 27, 2011
  4. Junio C HamanoAug 27, 2011
  5. git project patch workflowMichael Haggerty, Aug 28, 2011
  6. Jeff KingAug 29, 2011
  7. Jeff KingAug 29, 2011
  8. Junio C HamanoAug 29, 2011
  9. Jeff KingAug 29, 2011
  10. Johannes SixtAug 29, 2011
  11. Jeff KingAug 29, 2011
  12. Junio C HamanoAug 29, 2011
  13. 2/2 Forbid DEL characters in reference namesMichael Haggerty, Aug 27, 2011
  14. Junio C HamanoAug 27, 2011

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.