This iteration fixes some tests introduced in the previous iteration. 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(-) And here is the result of a `--range-diff` from the previous iteration, that implicitly produced the current cover-letter :-) Range-diff against v4: 1: 678bae2e42 ! 1: 1dbfce39d9 t4014: cleanups in a few tests @@ t/t4014-format-patch.sh: test_expect_success 'format-patch --notes --signoff' ' ' test_expect_success 'format-patch notes output control' ' -+ test_when_finished "git notes remove HEAD" && ++ test_when_finished "git notes remove HEAD || :" && git notes add -m "notes config message" HEAD && - test_when_finished git notes remove HEAD && @@ t/t4014-format-patch.sh: test_expect_success 'format-patch notes output control' test_expect_success 'format-patch with multiple notes refs' ' + test_when_finished "git notes --ref note1 remove HEAD; -+ git notes --ref note2 remove HEAD" && ++ git notes --ref note2 remove HEAD || :" && git notes --ref note1 add -m "this is note 1" HEAD && - test_when_finished git notes --ref note1 remove HEAD && git notes --ref note2 add -m "this is note 2" HEAD && @@ t/t4014-format-patch.sh: test_expect_success 'format-patch with multiple notes r test_when_finished "test_unconfig format.notes" && + test_when_finished "git notes --ref note1 remove HEAD; -+ git notes --ref note2 remove HEAD" && ++ git notes --ref note2 remove HEAD || :" && git notes --ref note1 add -m "this is note 1" HEAD && - test_when_finished git notes --ref note1 remove HEAD && git notes --ref note2 add -m "this is note 2" HEAD && 2: 7d3afe14a7 = 2: fa22af3ed5 format-patch: assume --cover-letter for diff in multi-patch series -- 2.45.2.23.gd1e9f8561b