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

[PATCH v4 0/2] format-patch: assume --cover-letter for diff in multi-patch series

From
Rubén Justo <rjusto@gmail.com>
Date
Jun 7, 2024, 16:29 UTC
Message-ID
<9f520828-f87e-49b1-aa4b-c00ec6bb0133@gmail.com>
In-Reply-To
<cb6b6d54-959f-477d-83e5-027c81ae85de@gmail.com>

This iteration incorporates the changes to the tests suggested in the reviews from the previous iteration.

The main change is to split the tests proposed in the previous iteration into several separate tests; separating the functionality that checks when `--cover-letter` is implicitly assumed, from the tests that check when this implicit assumption is avoided.

The new patch in the series, [1/2], is a preparation patch that reorders the way `test_when_finished` is used in t4014, making it more reasonable and logical.

Thanks.
Rubén Justo (2):
  t4014: cleanups in a few tests
  format-patch: assume --cover-letter for diff in multi-patch series
 builtin/log.c           |  2 ++
 t/t3206-range-diff.sh   | 14 ++++++++++++++
 t/t4014-format-patch.sh | 25 ++++++++++++++++++++-----
 3 files changed, 36 insertions(+), 5 deletions(-)
Range-diff against v3:
-:  ---------- > 1:  678bae2e42 t4014: cleanups in a few tests
1:  78aeff9016 ! 2:  d1e9f8561b format-patch: assume --cover-letter for diff in multi-patch series
    @@ t/t3206-range-diff.sh: do
      	'
      done
      
    -+test_expect_success "format-patch --range-diff, implicit --cover-letter" '
    ++test_expect_success "--range-diff implies --cover-letter for multi-patch series" '
    ++	test_when_finished "rm -f v2-000?-*" &&
    ++	git format-patch -v2 --range-diff=topic main..unmodified &&
    ++	test_grep "^Range-diff against v1:$" v2-0000-cover-letter.patch
    ++'
    ++
    ++test_expect_success "explicit --no-cover-letter defeats implied --cover-letter" '
    ++	test_when_finished "rm -f v2-000?-*" &&
     +	test_must_fail git format-patch --no-cover-letter \
     +		-v2 --range-diff=topic main..unmodified &&
     +	test_must_fail git -c format.coverLetter=no format-patch \
    -+		-v2 --range-diff=topic main..unmodified &&
    -+	git format-patch -v2 --range-diff=topic main..unmodified &&
    -+	test_when_finished "rm v2-000?-*" &&
    -+	test_grep "^Range-diff against v1:$" v2-0000-cover-letter.patch
    ++		-v2 --range-diff=topic main..unmodified
     +'
     +
      test_expect_success 'format-patch --range-diff as commentary' '
    @@ t/t4014-format-patch.sh: test_expect_success 'interdiff: solo-patch' '
      '
      
     +test_expect_success 'interdiff: multi-patch, implicit --cover-letter' '
    -+	test_must_fail git format-patch --no-cover-letter \
    -+		--interdiff=boop~2 -2 -v23 &&
    -+	test_must_fail git -c format.coverLetter=no format-patch \
    -+		--interdiff=boop~2 -2 -v23 &&
    ++	test_when_finished "rm -f v23-0*.patch" &&
     +	git format-patch --interdiff=boop~2 -2 -v23 &&
     +	test_grep "^Interdiff against v22:$" v23-0000-cover-letter.patch &&
     +	test_cmp expect actual
     +'
    ++
    ++test_expect_success 'interdiff: explicit --no-cover-letter defeats implied --cover-letter' '
    ++	test_when_finished "rm -f v23-0*.patch" &&
    ++	test_must_fail git format-patch --no-cover-letter \
    ++		--interdiff=boop~2 -2 -v23 &&
    ++	test_must_fail git -c format.coverLetter=no format-patch \
    ++		--interdiff=boop~2 -2 -v23
    ++'
     +
      test_expect_success 'format-patch does not respect diff.noprefix' '
      	git -c diff.noprefix format-patch -1 --stdout >actual &&
-- 
2.45.2.23.gd1e9f8561b
Previous: Rubén JustoNext: Rubén Justo
Message 12 of 21 in “format-patch: assume --cover-letter for diff in multi-patch series”
  1. format-patch: assume --cover-letter for diff in multi-patch seriesRubén Justo, Jun 3, 2024
  2. Patrick SteinhardtJun 4, 2024
  3. Junio C HamanoJun 4, 2024
  4. Rubén JustoJun 5, 2024
  5. Junio C HamanoJun 5, 2024
  6. Junio C HamanoJun 5, 2024
  7. format-patch: assume --cover-letter for diff in multi-patch seriesRubén Justo, Jun 5, 2024
  8. Junio C HamanoJun 5, 2024
  9. Rubén JustoJun 5, 2024
  10. Junio C HamanoJun 5, 2024
  11. Rubén JustoJun 5, 2024
  12. 0/2 format-patch: assume --cover-letter for diff in multi-patch seriesRubén Justo, Jun 7, 2024
  13. 1/2 t4014: cleanups in a few testsRubén Justo, Jun 7, 2024
  14. Junio C HamanoJun 7, 2024
  15. Rubén JustoJun 7, 2024
  16. Junio C HamanoJun 7, 2024
  17. 2/2 format-patch: assume --cover-letter for diff in multi-patch seriesRubén Justo, Jun 7, 2024
  18. 0/2 format-patch: assume --cover-letter for diff in multi-patch seriesRubén Justo, Jun 7, 2024
  19. 1/2 t4014: cleanups in a few testsRubén Justo, Jun 7, 2024
  20. 2/2 format-patch: assume --cover-letter for diff in multi-patch seriesRubén Justo, Jun 7, 2024
  21. Junio C HamanoJun 7, 2024

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.