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

Re: [PATCH 0/3] Re-fix rebase -i with SHA-1 collisions

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jan 17, 2020, 22:37 UTC
Message-ID
<20200117223734.GA6570@camp.crustytoothpaste.net>
In-Reply-To
<nycvar.QRO.7.76.6.2001171050000.46@tvgsbejvaqbjf.bet>
On 2020-01-17 at 09:51:42, Johannes Schindelin wrote:
Show 13 quoted lines
> > This series looks great to me, and thanks for fixing this.
> >
> > As mentioned in the PR, I'm happy for you to drop the SHA-256 patch into
> > this series if you like, or I can carry it in a future series.  Either
> > way is fine with me.
> 
> Excellent. Given that the re-fix to avoid short commit ID collisions has
> little to do with supporting SHA-256, I would like to keep the patch
> series separate, then.
> 
> The question whether to move the SHA-256 support patch into your series is
> more a question to Junio, i.e. which patch series will be merged down
> faster.

I need to do a reroll of part 8, so I'll pick it into a future series (part 9) of test fixes and drop my patch. That way it won't interfere with either series making progress, but it will still be included at the end.

-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
Previous: Johannes SchindelinNext: Junio C Hamano
Message 10 of 28 in “Re-fix rebase -i with SHA-1 collisions”
  1. 0/3 Re-fix rebase -i with SHA-1 collisionsJohannes Schindelin via GitGitGadget, Jan 16, 2020
  2. 1/3 parse_insn_line(): improve error message when parsing failedJohannes Schindelin via GitGitGadget, Jan 16, 2020
  3. Junio C HamanoJan 17, 2020
  4. 2/3 rebase -i: re-fix short SHA-1 collisionJohannes Schindelin via GitGitGadget, Jan 16, 2020
  5. Junio C HamanoJan 17, 2020
  6. Johannes SchindelinJan 17, 2020
  7. 3/3 rebase -i: also avoid SHA-1 collisions with missingCommitsCheckJohannes Schindelin via GitGitGadget, Jan 16, 2020
  8. brian m. carlsonJan 16, 2020
  9. Johannes SchindelinJan 17, 2020
  10. brian m. carlsonJan 17, 2020
  11. Junio C HamanoJan 21, 2020
  12. 0/3 Re-fix rebase -i with SHA-1 collisionsJohannes Schindelin via GitGitGadget, Jan 17, 2020
  13. 1/3 parse_insn_line(): improve error message when parsing failedJohannes Schindelin via GitGitGadget, Jan 17, 2020
  14. Junio C HamanoJan 21, 2020
  15. Johannes SchindelinJan 23, 2020
  16. 3/3 rebase -i: also avoid SHA-1 collisions with missingCommitsCheckJohannes Schindelin via GitGitGadget, Jan 17, 2020
  17. 2/3 rebase -i: re-fix short SHA-1 collisionJohannes Schindelin via GitGitGadget, Jan 17, 2020
  18. Eric SunshineJan 20, 2020
  19. Johannes SchindelinJan 20, 2020
  20. Eric SunshineJan 20, 2020
  21. Johannes SchindelinJan 21, 2020
  22. Junio C HamanoJan 21, 2020
  23. Johannes SchindelinJan 22, 2020
  24. Junio C HamanoJan 22, 2020
  25. 0/3 Re-fix rebase -i with SHA-1 collisionsJohannes Schindelin via GitGitGadget, Jan 23, 2020
  26. 1/3 parse_insn_line(): improve error message when parsing failedJohannes Schindelin via GitGitGadget, Jan 23, 2020
  27. 2/3 rebase -i: re-fix short SHA-1 collisionJohannes Schindelin via GitGitGadget, Jan 23, 2020
  28. 3/3 rebase -i: also avoid SHA-1 collisions with missingCommitsCheckJohannes Schindelin via GitGitGadget, Jan 23, 2020

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.