threads / discuss / 50022

Preparing for 2.20.1 brown-paper-bag maintenance release

Subject: Preparing for 2.20.1 brown-paper-bag maintenance release

## tl;dr

6 messages between Dec 13, 2018 and Dec 14, 2018.

replies: 5people: 4as markdown or json

Junio C Hamano· Dec 13, 2018, 06:29 UTC · lore

Here is an excerpt from a draft edition of "What's cooking" report for topics that are about an immediate 2.20.1 maintenance release, with five topics that I plan to merge to 'next' and then to 'maint' soonish (they're all marked as "Will merge to 'next' and then to 'master'").

They'll be in 'pu' but not in 'next' in today's pushout, but unless I hear breakage reports in time, I am hoping to merge them to 'next' during tomorrow's integration cycle, so that we can start the new week with 2.20.1.

Thanks.
--------------------------------------------------
* ds/hash-independent-tests-fix (2018-12-12) 1 commit
 - .gitattributes: ensure t/oid-info/* has eol=lf
 Test portability fix.
* jc/run-command-report-exec-failure-fix (2018-12-12) 1 commit
 - run-command: report exec failure
 A recent update accidentally squelched an error message when the
 run_command API failed to run a missing command, which has been
 corrected.
* nd/show-gitcomp-compilation-fix (2018-12-12) 1 commit
 - parse-options: fix SunCC compiler warning
 Portability fix for a recent update to parse-options API.
* js/help-commands-verbose-by-default-fix (2018-12-12) 2 commits
 - help -a: handle aliases with long names gracefully
 - help.h: fix coding style
 "git help -a" did not work well when an overly long alias is
 defined, which has been corrected.
* js/mailinfo-format-flowed-fix (2018-12-13) 1 commit
 - t4256: mark support files as LF-only
 Test portability fix.
Johannes Schindelin· Dec 13, 2018, 12:50 UTC · re: Junio C Hamano · lore

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

Hi Junio,
On Thu, 13 Dec 2018, Junio C Hamano wrote:
Show 11 quoted lines
> * ds/hash-independent-tests-fix (2018-12-12) 1 commit
>  - .gitattributes: ensure t/oid-info/* has eol=lf
> 
>  Test portability fix.
>
> [...]
>
> * js/mailinfo-format-flowed-fix (2018-12-13) 1 commit
>  - t4256: mark support files as LF-only
> 
>  Test portability fix.

We found one more issue that I'd like to get fixed while we're at it: one test case in t9902 now needs the PERL prerequisite.

Let me coordinate with Stolee who will send this.

Ciao, Dscho

Ævar Arnfjörð Bjarmason· Dec 13, 2018, 14:05 UTC · re: Junio C Hamano · lore

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

On Thu, Dec 13 2018, Junio C Hamano wrote:
Show 15 quoted lines
> Here is an excerpt from a draft edition of "What's cooking" report
> for topics that are about an immediate 2.20.1 maintenance release,
> with five topics that I plan to merge to 'next' and then to 'maint'
> soonish (they're all marked as "Will merge to 'next' and then to
> 'master'").
>
> They'll be in 'pu' but not in 'next' in today's pushout, but unless
> I hear breakage reports in time, I am hoping to merge them to 'next'
> during tomorrow's integration cycle, so that we can start the new
> week with 2.20.1.
> [...]
> * nd/show-gitcomp-compilation-fix (2018-12-12) 1 commit
>  - parse-options: fix SunCC compiler warning
>
>  Portability fix for a recent update to parse-options API.

Since I reported this, just a clarification: Unlike 46c0eb5843 ("files-backend.c: fix build error on Solaris", 2018-11-25) this one's not an error on suncc, just a warning (and we have 20-30 of those exact warnings in our code).

So if you wanted to minimize 2.20.1 this could be held back, but also it looks obviously correct so it's fine that it makes it into that point release. Just FYI.

Duy Nguyen· Dec 13, 2018, 18:08 UTC · re: Ævar Arnfjörð Bjarmason · lore

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

On Thu, Dec 13, 2018 at 3:05 PM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 28 quoted lines
>
>
> On Thu, Dec 13 2018, Junio C Hamano wrote:
>
> > Here is an excerpt from a draft edition of "What's cooking" report
> > for topics that are about an immediate 2.20.1 maintenance release,
> > with five topics that I plan to merge to 'next' and then to 'maint'
> > soonish (they're all marked as "Will merge to 'next' and then to
> > 'master'").
> >
> > They'll be in 'pu' but not in 'next' in today's pushout, but unless
> > I hear breakage reports in time, I am hoping to merge them to 'next'
> > during tomorrow's integration cycle, so that we can start the new
> > week with 2.20.1.
> > [...]
> > * nd/show-gitcomp-compilation-fix (2018-12-12) 1 commit
> >  - parse-options: fix SunCC compiler warning
> >
> >  Portability fix for a recent update to parse-options API.
>
> Since I reported this, just a clarification: Unlike 46c0eb5843
> ("files-backend.c: fix build error on Solaris", 2018-11-25) this one's
> not an error on suncc, just a warning (and we have 20-30 of those exact
> warnings in our code).
>
> So if you wanted to minimize 2.20.1 this could be held back, but also it
> looks obviously correct so it's fine that it makes it into that point
> release. Just FYI.

There's also a bug in my patch (-2 is already being used by parse_opt_unknown_cb and my patch will change behavior of git-blame at least in theory). I'll reroll later. I think it's better to hold it back.

-- 
Duy
Duy Nguyen· Dec 13, 2018, 18:17 UTC · re: Duy Nguyen · lore

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

On Thu, Dec 13, 2018 at 7:08 PM Duy Nguyen <pclouds@gmail.com> wrote:
> There's also a bug in my patch (-2 is already being used by
> parse_opt_unknown_cb and my patch will change behavior of git-blame at
> least in theory).

Ah no. Too many magic numbers in parse-options.c code. It's working fine but I'll need to give these some names to avoid confusion in the future.

-- 
Duy
Junio C Hamano· Dec 14, 2018, 02:40 UTC · re: Duy Nguyen · lore

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

Duy Nguyen <pclouds@gmail.com> writes:
Show 8 quoted lines
> On Thu, Dec 13, 2018 at 7:08 PM Duy Nguyen <pclouds@gmail.com> wrote:
>> There's also a bug in my patch (-2 is already being used by
>> parse_opt_unknown_cb and my patch will change behavior of git-blame at
>> least in theory).
>
> Ah no. Too many magic numbers in parse-options.c code. It's working
> fine but I'll need to give these some names to avoid confusion in the
> future.
OK.

← back to recent threads