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

Re: [PATCH v2 2/3] rebase -i: re-fix short SHA-1 collision

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 21, 2020, 22:02 UTC
Message-ID
<xmqqpnfc8o39.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CAPig+cR2T26nJ1G5n82r_Xi8Y84k211n6bhBxG4Ku27vaW1pWA@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
Show 16 quoted lines
> On Mon, Jan 20, 2020 at 3:04 PM Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
>> On Mon, 20 Jan 2020, Eric Sunshine wrote:
>> > On Fri, Jan 17, 2020 at 6:38 PM Johannes Schindelin via GitGitGadget
>> > <gitgitgadget@gmail.com> wrote:
>> > > +       test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
>> >
>> > How much do we care that this is introducing new code with git
>> > upstream of a pipe (considering recent efforts to eradicate such
>> > usage)? Same question regarding several other new instances introduce
>> > by this patch.
>>
>> I would argue that the test case will fail if the `git` call fails. So I
>> am not overly concerned if that `git` call is upstream of a pipe.
>
> Unless the git command crashes _after_ it produces the correct output...

True. Doesn't rev-parse have an appropriate option for this kind of thing that gets rid of the need for "cut" in the first place?

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 22 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.