| Message ID | c17ff7ac483ad3990680a3bb1b67898564eb9379.1626421416.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Normalize newlines in merge & interpret-trailer | expand |
On Fri, Jul 16, 2021 at 07:43:35AM +0000, Luca Weiss via GitGitGadget wrote: > From: Luca Weiss <luca@z3ntu.xyz> > > Add a corresponding test case for this as well The details you put in the cover letter won't make it into the Git history. This would be a good place to put them. > t/t7513-interpret-trailers.sh | 7 +++++++ > trailer.c | 3 +++ > 2 files changed, 10 insertions(+) That patch itself looks good to me, with one minor style nit: > diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh > index 04885d0a5e5..ff5f1724ad0 100755 > --- a/t/t7513-interpret-trailers.sh > +++ b/t/t7513-interpret-trailers.sh > @@ -17,6 +17,7 @@ test_expect_success 'setup' ' > > body > EOF > + printf "subject\n\nbody" > basic_message_no_eol && Our preferred style is to omit whitespace between redirection operators and filenames (i.e., ">basic_message_no_eol"). > +test_expect_success 'with message without trailing newline twice' ' > + git interpret-trailers --trailer "Cc: Peff" basic_message_no_eol > intermediary && > + git interpret-trailers --trailer "Cc: Peff" intermediary > actual && > + test_cmp intermediary actual > +' Ditto here. -Peff
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index 04885d0a5e5..ff5f1724ad0 100755 --- a/t/t7513-interpret-trailers.sh +++ b/t/t7513-interpret-trailers.sh @@ -17,6 +17,7 @@ test_expect_success 'setup' ' body EOF + printf "subject\n\nbody" > basic_message_no_eol && cat >complex_message_body <<-\EOF && my subject @@ -676,6 +677,12 @@ test_expect_success 'with message that has an old style conflict block' ' test_cmp expected actual ' +test_expect_success 'with message without trailing newline twice' ' + git interpret-trailers --trailer "Cc: Peff" basic_message_no_eol > intermediary && + git interpret-trailers --trailer "Cc: Peff" intermediary > actual && + test_cmp intermediary actual +' + test_expect_success 'with commit complex message and trailer args' ' cat complex_message_body >expected && sed -e "s/ Z\$/ /" >>expected <<-\EOF && diff --git a/trailer.c b/trailer.c index 7c7cb61a945..f53cf7d07d4 100644 --- a/trailer.c +++ b/trailer.c @@ -765,6 +765,9 @@ static void read_input_file(struct strbuf *sb, const char *file) if (strbuf_read(sb, fileno(stdin), 0) < 0) die_errno(_("could not read from stdin")); } + + /* Make sure the input ends with a newline */ + strbuf_complete_line(sb); } static const char *next_line(const char *str)