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

Re: [PATCH v4 8/8] t5520: check reflog action in fast-forward merge

From
Junio C Hamano <gitster@pobox.com>
Date
May 21, 2015, 17:29 UTC
Message-ID
<xmqqk2w1kffa.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CACRoPnRHAA7w8iJ-GQGPt11Hnm29o6wgP5bEG_q531XmcK-P1Q@mail.gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
Show 13 quoted lines
> On Mon, May 18, 2015 at 11:20 PM, Johannes Schindelin
> ...
>>> +     sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
>>
>> Actually, let's use "s/^[0-9a-f]*/OBJID/" instead: you only want to
>> replace the first few characters.
>
> Did you mean "s/^$_x05[0-9a-f]*/OBJID/"? (with "$_x05" expanding to
> '[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' from test-lib.sh). If not,
> then it would match even if there was no SHA1 hash.
>
> But yes, without the "^" there will very likely be false positives.
> Thanks for catching.

I think the suggestion was more about "do we guarantee that there would always be at least five?" It might happen to be the case with our current default, but these tests do not fundamentally rely on that default staying the same. s/^[0-9a-f][0-9a-f]*/OBJECTNAME/g is probably the right balance between cautiousness (you do not want to match an empty string) and future-proofing (you do not want to rely on us having at least five).

Thanks.
Previous: Paul Tan
Message 24 of 24 in “Improve git-pull test coverage”
  1. 0/8 Improve git-pull test coveragePaul Tan, May 18, 2015
  2. 1/8 t5520: prevent field splitting in content comparisonsPaul Tan, May 18, 2015
  3. Junio C HamanoMay 18, 2015
  4. 2/8 t5520: test no merge candidates casesPaul Tan, May 18, 2015
  5. Johannes SchindelinMay 18, 2015
  6. Junio C HamanoMay 18, 2015
  7. debugging git tests, was: Re: [PATCH v4 2/8] t5520: test no merge candidates casesJeff King, May 18, 2015
  8. Junio C HamanoMay 18, 2015
  9. Johannes SchindelinMay 19, 2015
  10. Jeff KingJun 5, 2015
  11. 3/8 t5520: test for failure if index has unresolved entriesPaul Tan, May 18, 2015
  12. Johannes SchindelinMay 18, 2015
  13. Paul TanMay 21, 2015
  14. 4/8 t5520: test work tree fast-forward when fetch updates headPaul Tan, May 18, 2015
  15. Johannes SchindelinMay 18, 2015
  16. 5/8 t5520: test --rebase with multiple branchesPaul Tan, May 18, 2015
  17. 6/8 t5520: test --rebase failure on unborn branch with indexPaul Tan, May 18, 2015
  18. Stefan BellerMay 18, 2015
  19. Paul TanMay 21, 2015
  20. 7/8 t5521: test --dry-run does not make any changesPaul Tan, May 18, 2015
  21. 8/8 t5520: check reflog action in fast-forward mergePaul Tan, May 18, 2015
  22. Johannes SchindelinMay 18, 2015
  23. Paul TanMay 21, 2015
  24. Junio C HamanoMay 21, 2015

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.