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

Re: [PATCH] hash binary sha1 into patch id

From
Clemens Buchacher <drizzd@aon.at>
Date
Aug 13, 2010, 21:58 UTC
Message-ID
<20100813215801.GA24534@localhost>
In-Reply-To
<20100813213726.GB2516@burratino>
On Fri, Aug 13, 2010 at 04:37:26PM -0500, Jonathan Nieder wrote:
Show 13 quoted lines
> 
> FWIW what I was imagining was some structured binary format:
> 
> With A some long string, patch 1:
> 
>  A  --> AAA
> 
> Patch 2:
> 
>  AA --> AAA
> 
> Ideally one would want an attempt to apply patch 2 to result in a
> conflict.  Probably that is far-fetched.

Actually, rebase will try to merge the respective branches and it will typically succeed, because the post-images are the same. It will fail due to conflict only if yet another patch has been applied upstream on top of patch 1.

But that is also how textual changes behave. So for the sake of consistency, it makes sense to require the pre-images to be the same. I will resend an appropriate patch tomorrow.

Previous: Jonathan NiederNext: Clemens Buchacher
Message 5 of 13 in “hash binary sha1 into patch id”
  1. hash binary sha1 into patch idClemens Buchacher, Aug 13, 2010
  2. Jonathan NiederAug 13, 2010
  3. Clemens BuchacherAug 13, 2010
  4. Jonathan NiederAug 13, 2010
  5. Clemens BuchacherAug 13, 2010
  6. hash binary sha1 into patch idClemens Buchacher, Aug 15, 2010
  7. Jonathan NiederAug 15, 2010
  8. Marat RadchenkoSep 10, 2010
  9. Clemens BuchacherSep 10, 2010
  10. Marat RadchenkoOct 13, 2010
  11. Marat RadchenkoOct 13, 2010
  12. Clemens BuchacherOct 13, 2010
  13. Marat RadchenkoOct 14, 2010

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.