Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-29 Thread Jeff King
On Mon, May 28, 2018 at 01:20:41PM +0200, Johannes Schindelin wrote: > On Mon, 28 May 2018, Junio C Hamano wrote: > > > Johannes Schindelin writes: > > > > > On Thu, 24 May 2018, Junio C Hamano wrote: > > > > > >> * js/empty-config-section-fix (2018-05-18) 1 commit > > >> - config: a

Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-28 Thread Johannes Schindelin
Hi Junio, On Mon, 28 May 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Thu, 24 May 2018, Junio C Hamano wrote: > > > >> * js/empty-config-section-fix (2018-05-18) 1 commit > >> - config: a user-provided invalid section is not a BUG > >> > >>

Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-27 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Thu, 24 May 2018, Junio C Hamano wrote: > >> * js/empty-config-section-fix (2018-05-18) 1 commit >> - config: a user-provided invalid section is not a BUG >> >> Error codepath fix. >> >> Will merge to 'next'. > > As

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-27 Thread Junio C Hamano
Elijah Newren writes: > On Wed, May 23, 2018 at 5:02 PM, Junio C Hamano wrote: >> Here are the topics that have been cooking. Commits prefixed with >> '-' are only in 'pu' (proposed updates) while commits prefixed with >> '+' are in 'next'. The ones marked

js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-25 Thread Johannes Schindelin
Hi Junio, On Thu, 24 May 2018, Junio C Hamano wrote: > * js/empty-config-section-fix (2018-05-18) 1 commit > - config: a user-provided invalid section is not a BUG > > Error codepath fix. > > Will merge to 'next'. As a hotfix, maybe we can fast-track it to master? Thanks, Dscho

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-24 Thread Luke Diamand
On 24 May 2018 at 01:02, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-24 Thread Ævar Arnfjörð Bjarmason
On Thu, May 24 2018, Junio C Hamano wrote: > * ab/fetch-tags-noclobber (2018-05-16) 9 commits > - fixup! push tests: assert re-pushing annotated tags > - fetch: stop clobbering existing tags without --force > - fetch tests: add a test clobbering tag behavior > - fetch tests: correct a

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-24 Thread Stefan Beller
> * sb/diff-color-move-more (2018-05-21) 8 commits > - diff: color-moved white space handling options imply color-moved > - diff.c: add --color-moved-ignore-space-delta option > - diff.c: decouple white space treatment from move detection algorithm > - diff.c: add a blocks mode for moved code

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-24 Thread Elijah Newren
Hi Junio, On Wed, May 23, 2018 at 5:02 PM, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of >

What's cooking in git.git (May 2018, #03; Wed, 23)

2018-05-23 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes