Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Junio C Hamano
Stefan Beller writes: >> I find the design a bit iffy in that our usual "missing in the >> working tree? let's use the latest blob" fallback is to take it >> from the index, not from the HEAD. > > I am not sure; why does it feel iffy? Why doesn't it? There is no justification why it has to

pw/rebase-i-author-script-fix, was Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Johannes Schindelin
Team, On Mon, 20 Aug 2018, Phillip Wood wrote: > On 17/08/2018 23:44, 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

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Jonathan Nieder
Junio C Hamano wrote: > * jh/structured-logging (2018-07-25) 25 commits > - structured-logging: add config data facility > - structured-logging: t0420 tests for interacitve child_summary > - structured-logging: t0420 tests for child process detail events > - structured-logging: add child

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Derrick Stolee
On 8/20/2018 1:26 PM, Junio C Hamano wrote: Jonathan Nieder writes: Usually, I refrain from merging larger topics in 'next' down to 'master' when we get close to -rc0, but I am wondering if it is better to merge all of them to 'master', even the ones on the larger and possibly undercooked

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Stefan Beller
On Fri, Aug 17, 2018 at 3:44 PM Junio C Hamano wrote: > > Usually, I refrain from merging larger topics in 'next' down to > 'master' when we get close to -rc0, but I am wondering if it is > better to merge all of them to 'master', even the ones on the larger > and possibly undercooked side,

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Eric Sunshine
On Mon, Aug 20, 2018 at 6:23 AM Phillip Wood wrote: > On 17/08/2018 23:44, Junio C Hamano wrote: > > * pw/rebase-i-author-script-fix (2018-08-07) 2 commits > > - sequencer: fix quoting in write_author_script > > - sequencer: handle errors from read_author_ident() > > > > Undecided. > > Is it

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Junio C Hamano
Jonathan Nieder writes: >> Usually, I refrain from merging larger topics in 'next' down to >> 'master' when we get close to -rc0, but I am wondering if it is >> better to merge all of them to 'master', even the ones on the larger >> and possibly undercooked side, expecting that we collectively

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Phillip Wood
On 17/08/2018 23:44, 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 branches, but I am still

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Christian Couder
On Sat, Aug 18, 2018 at 1:34 PM Ævar Arnfjörð Bjarmason wrote: > On Sat, Aug 18 2018, Christian Couder wrote: > > FYI this has been requested from GitLab by Drupal (as well as others) > > see > > https://www.drupal.org/drupalorg/blog/developer-tools-initiative-part-5-gitlab-partnership > >

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Ævar Arnfjörð Bjarmason
On Sat, Aug 18 2018, Christian Couder wrote: > On Sat, Aug 18, 2018 at 12:44 AM Junio C Hamano wrote: > >> * cc/delta-islands (2018-08-16) 7 commits >> - pack-objects: move 'layer' into 'struct packing_data' >> - pack-objects: move tree_depth into 'struct packing_data' >> - t5320: tests for

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Ævar Arnfjörð Bjarmason
On Fri, Aug 17 2018, Junio C Hamano wrote: > Usually, I refrain from merging larger topics in 'next' down to > 'master' when we get close to -rc0, but I am wondering if it is > better to merge all of them to 'master', even the ones on the larger > and possibly undercooked side, expecting that

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Christian Couder
On Sat, Aug 18, 2018 at 12:44 AM Junio C Hamano wrote: > * cc/delta-islands (2018-08-16) 7 commits > - pack-objects: move 'layer' into 'struct packing_data' > - pack-objects: move tree_depth into 'struct packing_data' > - t5320: tests for delta islands > - repack: add delta-islands support >

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: > Usually, I refrain from merging larger topics in 'next' down to > 'master' when we get close to -rc0, but I am wondering if it is > better to merge all of them to 'master', even the ones on the larger > and possibly undercooked side, expecting that we collectively

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-18 Thread Duy Nguyen
On Sat, Aug 18, 2018 at 12:44 AM Junio C Hamano wrote: > * nd/unpack-trees-with-cache-tree (2018-08-13) 5 commits > - unpack-trees: reuse (still valid) cache-tree from src_index > - unpack-trees: reduce malloc in cache-tree walk > - unpack-trees: optimize walking same trees with cache-tree >

What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-17 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. Quite a many topics have