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

Re: [PATCH 2/4] format-patch: fix a bug in option exclusivity and add a test to t4014

From
DSDragan Simic <dsimic@manjaro.org>
Date
Apr 17, 2024, 07:11 UTC
Message-ID
<9a6a9cb1d9dd07bbbbc47616c510779a@manjaro.org>
In-Reply-To
<CAPig+cSGZr4zE=Dp7Z58CN0kmkpXdc8SOopXmB9=ry4gwNkq=w@mail.gmail.com>
On 2024-04-17 08:40, Eric Sunshine wrote:
Show 32 quoted lines
> On Wed, Apr 17, 2024 at 2:34 AM Kristoffer Haugsbakk
> <code@khaugsbakk.name> wrote:
>> On Wed, Apr 17, 2024, at 05:32, Dragan Simic wrote:
>> > Fix a bug that allows --rfc and -k options to be specified together when
>> > executing "git format-patch".  This bug was introduced back in the commit
>> > e0d7db7423a9 ("format-patch: --rfc honors what --subject-prefix sets"),
>> > about eight months ago, but it has remained undetected so far, presumably
>> > because of no associated test coverage.
>> 
>> I don’t think speculating on why the bug is still there improves the
>> commit message.
>> 
>> This paragraph could perhaps be rewritten to
>> 
>>   “ Fix a bug from e0d7db7423a (format-patch: --rfc honors what
>>     --subject-prefix sets, 2023-08-30) that allows --rfc and -k 
>> options
>>     to be specified together when executing "git format-patch".
>> 
>> The extra sentence in the original doesn’t really explain anything 
>> more
>> about the commit. Except the “eight months ago”, but here I’ve used 
>> the
>> “reference” style (not the Linux-style) which contains the date.
>> > @@ -2050,8 +2050,11 @@ int cmd_format_patch(int argc, const char
>> > -     if (rfc)
>> > +     /* Also mark the subject prefix as modified, for later checks */
>> 
>> I think the code speaks for itself in this case.
> 
> Apparently we're thinking along the same lines since we both said
> essentially the same things in our reviews.
Two votes, so the comments goes away. :)
Show 11 quoted lines
>> > +test_expect_success '--rfc and -k cannot be used together' '
>> > +     test_must_fail git format-patch -1 --stdout --rfc -k >patch
>> 
>> I don’t understand why you redirect to `patch` if you only check the
>> exit code. (I don’t expect any stdout since it will fail.)
> 
> I had the same question but left it unwritten since I noticed that
> this new test is modelled after the test immediately following it in
> the script, and the existing test also redirects to "patch"
> unnecessarily. So, if it's done this way for consistency with existing
> tests, I don't mind letting it slide.

Yes, I also wasn't super happy with this new test, as I already noted in one of my replies, but improving this and the other similar tests is most probably something best left for a follow-up series.

Previous: Eric SunshineNext: Kristoffer Haugsbakk
Message 11 of 51 in “format-patch: fix an option coexistence bug and add new --resend option”
  1. 0/4 format-patch: fix an option coexistence bug and add new --resend optionDragan Simic, Apr 17, 2024
  2. 1/4 format-patch docs: avoid use of parentheses to improve readabilityDragan Simic, Apr 17, 2024
  3. 2/4 format-patch: fix a bug in option exclusivity and add a test to t4014Dragan Simic, Apr 17, 2024
  4. Eric SunshineApr 17, 2024
  5. Dragan SimicApr 17, 2024
  6. Patrick SteinhardtApr 17, 2024
  7. Dragan SimicApr 17, 2024
  8. Dragan SimicApr 18, 2024
  9. Kristoffer HaugsbakkApr 17, 2024
  10. Eric SunshineApr 17, 2024
  11. Dragan SimicApr 17, 2024
  12. Kristoffer HaugsbakkApr 17, 2024
  13. Dragan SimicApr 17, 2024
  14. Dragan SimicApr 17, 2024
  15. Dragan SimicApr 17, 2024
  16. 4/4 t4014: add tests to cover --resend option and its exclusivityDragan Simic, Apr 17, 2024
  17. Eric SunshineApr 17, 2024
  18. Dragan SimicApr 17, 2024
  19. 3/4 format-patch: new --resend option for adding "RESEND" to patch subjectsDragan Simic, Apr 17, 2024
  20. Kristoffer HaugsbakkApr 17, 2024
  21. Dragan SimicApr 17, 2024
  22. Kristoffer HaugsbakkApr 17, 2024
  23. Dragan SimicApr 17, 2024
  24. Eric SunshineApr 17, 2024
  25. Dragan SimicApr 17, 2024
  26. Eric SunshineApr 17, 2024
  27. Dragan SimicApr 17, 2024
  28. Dragan SimicApr 18, 2024
  29. Phillip WoodApr 17, 2024
  30. Dragan SimicApr 17, 2024
  31. Kristoffer HaugsbakkApr 17, 2024
  32. Dragan SimicApr 17, 2024
  33. Kristoffer HaugsbakkApr 17, 2024
  34. Dragan SimicApr 17, 2024
  35. Junio C HamanoApr 17, 2024
  36. Dragan SimicApr 17, 2024
  37. Junio C HamanoApr 17, 2024
  38. Dragan SimicApr 17, 2024
  39. Dragan SimicApr 18, 2024
  40. Junio C HamanoApr 18, 2024
  41. Dragan SimicApr 19, 2024
  42. Eric SunshineApr 19, 2024
  43. Dragan SimicApr 19, 2024
  44. Eric SunshineApr 19, 2024
  45. Junio C HamanoApr 19, 2024
  46. Eric SunshineApr 19, 2024
  47. Junio C HamanoApr 19, 2024
  48. Eric SunshineApr 17, 2024
  49. Dragan SimicApr 17, 2024
  50. Eric SunshineApr 17, 2024
  51. Dragan SimicApr 17, 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.