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

Re: [PATCH v4 1/2] sequencer: beautify subject of reverts of reverts

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 23, 2023, 21:38 UTC
Message-ID
<xmqqsf89e8wz.fsf@gitster.g>
In-Reply-To
<ZOZnNDd2pMX6M2Au@nand.local>
Taylor Blau <me@ttaylorr.com> writes:
Show 54 quoted lines
> This version is looking good. The main functionality is well-reasoned
> and straightforwardly implemented. One minor suggestion that you could
> consider squashing in is some test clean-up like so:
>
> --- 8< ---
> diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
> index 7011e3a421..4dee71d6d5 100755
> --- a/t/t3501-revert-cherry-pick.sh
> +++ b/t/t3501-revert-cherry-pick.sh
> @@ -176,29 +176,27 @@ test_expect_success 'advice from failed revert' '
>  	test_cmp expected actual
>  '
>
> +test_expect_commit_msg () {
> +	echo "$@" >expect &&
> +	git log -1 --pretty=%s >actual &&
> +	test_cmp expect actual
> +}
> +
>  test_expect_success 'title of fresh reverts' '
>  	test_commit --no-tag A file1 &&
>  	test_commit --no-tag B file1 &&
>  	git revert --no-edit HEAD &&
> -	echo "Revert \"B\"" >expect &&
> -	git log -1 --pretty=%s >actual &&
> -	test_cmp expect actual &&
> +	test_expect_commit_msg "Revert \"B\"" &&
>  	git revert --no-edit HEAD &&
> -	echo "Reapply \"B\"" >expect &&
> -	git log -1 --pretty=%s >actual &&
> -	test_cmp expect actual &&
> +	test_expect_commit_msg "Reapply \"B\"" &&
>  	git revert --no-edit HEAD &&
> -	echo "Revert \"Reapply \"B\"\"" >expect &&
> -	git log -1 --pretty=%s >actual &&
> -	test_cmp expect actual
> +	test_expect_commit_msg "Revert \"Reapply \"B\"\""
>  '
>
>  test_expect_success 'title of legacy double revert' '
>  	test_commit --no-tag "Revert \"Revert \"B\"\"" file1 &&
>  	git revert --no-edit HEAD &&
> -	echo "Revert \"Revert \"Revert \"B\"\"\"" >expect &&
> -	git log -1 --pretty=%s >actual &&
> -	test_cmp expect actual
> +	test_expect_commit_msg "Revert \"Revert \"Revert \"B\"\"\""
>  '
>
>  test_expect_success 'identification of reverted commit (default)' '
> --- >8 ---
>
> To my eyes, it makes checking the subject of our revert commit against
> an expected value more readable by factoring out the echo, git log,
> test_cmp pattern.

Yeah it does make the test more concise and what is expected stand out more clearly. Good suggestion.

Previous: Taylor BlauNext: Oswald Buddenhagen
Message 49 of 53 in “sequencer: beautify subject of reverts of reverts”
  1. sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Apr 28, 2023
  2. Junio C HamanoApr 28, 2023
  3. Oswald BuddenhagenApr 28, 2023
  4. Junio C HamanoMay 1, 2023
  5. Oswald BuddenhagenMay 1, 2023
  6. Junio C HamanoMay 1, 2023
  7. Junio C HamanoMay 5, 2023
  8. Phillip WoodMay 17, 2023
  9. Oswald BuddenhagenMay 17, 2023
  10. Phillip WoodMay 17, 2023
  11. Oswald BuddenhagenMay 17, 2023
  12. Phillip WoodMay 18, 2023
  13. Junio C HamanoMay 18, 2023
  14. Linus ArverJul 28, 2023
  15. Oswald BuddenhagenJul 28, 2023
  16. Junio C HamanoJul 28, 2023
  17. Oswald BuddenhagenJul 28, 2023
  18. Junio C HamanoJul 28, 2023
  19. Oswald BuddenhagenJul 28, 2023
  20. Linus ArverJul 28, 2023
  21. 1/2 sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Aug 9, 2023
  22. 2/2 doc: revert: add discussionOswald Buddenhagen, Aug 9, 2023
  23. Linus ArverAug 10, 2023
  24. Linus ArverAug 10, 2023
  25. Oswald BuddenhagenAug 11, 2023
  26. Linus ArverAug 11, 2023
  27. Oswald BuddenhagenAug 12, 2023
  28. Linus ArverSep 7, 2023
  29. Phillip WoodAug 11, 2023
  30. Oswald BuddenhagenAug 12, 2023
  31. Junio C HamanoAug 13, 2023
  32. Oswald BuddenhagenAug 14, 2023
  33. Phillip WoodAug 11, 2023
  34. Junio C HamanoAug 11, 2023
  35. Junio C HamanoAug 11, 2023
  36. Re* [PATCH v3 2/2] doc: revert: add discussionJunio C Hamano, Aug 11, 2023
  37. Junio C HamanoAug 11, 2023
  38. rsbecker@nexbridge.comAug 11, 2023
  39. Eric SunshineAug 11, 2023
  40. Oswald BuddenhagenAug 11, 2023
  41. Junio C HamanoAug 11, 2023
  42. Phillip WoodAug 11, 2023
  43. Junio C HamanoAug 11, 2023
  44. Oswald BuddenhagenAug 11, 2023
  45. 1/2 sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Aug 21, 2023
  46. 2/2 git-revert.txt: add discussionOswald Buddenhagen, Aug 21, 2023
  47. Junio C HamanoAug 21, 2023
  48. Taylor BlauAug 23, 2023
  49. Junio C HamanoAug 23, 2023
  50. Oswald BuddenhagenAug 24, 2023
  51. sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Sep 2, 2023
  52. Junio C HamanoSep 2, 2023
  53. Kristoffer HaugsbakkSep 11, 2023

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.