Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-02-05 Thread Thomas Gummerer
On 02/04, Junio C Hamano wrote: > Thomas Gummerer writes: > > > There was also some discussion around the naming of the option, but I > > don't have a strong opinion on that, so I'm happy with keeping the > > --[no-]overlay option. I just wanted to bring it up again here in > > case someone had

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-02-04 Thread Junio C Hamano
Thomas Gummerer writes: > There was also some discussion around the naming of the option, but I > don't have a strong opinion on that, so I'm happy with keeping the > --[no-]overlay option. I just wanted to bring it up again here in > case someone had a very strong opinion, and would prefer it b

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-02-04 Thread Thomas Gummerer
On 01/29, Junio C Hamano wrote: > * tg/checkout-no-overlay (2019-01-08) 8 commits > (merged to 'next' on 2019-01-18 at 1e2a79ba5c) > + checkout: introduce checkout.overlayMode config > + checkout: introduce --{,no-}overlay option > + checkout: factor out mark_cache_entry_for_checkout function

Re: mk/use-size-t-in-zlib [was: Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)]

2019-01-31 Thread Torsten Bögershausen
On Thu, Jan 31, 2019 at 06:59:17PM +0100, Thomas Braun wrote: > > Junio C Hamano hat am 29. Januar 2019 um 23:15 > > geschrieben: > > [...] > > > * mk/use-size-t-in-zlib (2018-10-15) 1 commit > > - zlib.c: use size_t for size > > > > The wrapper to call into zlib followed our long tradition to

mk/use-size-t-in-zlib [was: Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)]

2019-01-31 Thread Thomas Braun
> Junio C Hamano hat am 29. Januar 2019 um 23:15 > geschrieben: [...] > * mk/use-size-t-in-zlib (2018-10-15) 1 commit > - zlib.c: use size_t for size > > The wrapper to call into zlib followed our long tradition to use > "unsigned long" for sizes of regions in memory, which have been > upd

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-01-31 Thread Junio C Hamano
Denton Liu writes: > On Tue, Jan 29, 2019 at 02:15:36PM -0800, Junio C Hamano wrote: >> * dl/merge-cleanup-scissors-fix (2019-01-27) 5 commits >> - init docs: correct a punctuation typo >> - merge: add scissors line on merge conflict >> - merge: cleanup messages like commit >> - t7600: clean

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-01-31 Thread Junio C Hamano
Jeff Hostetler writes: >> A more structured way to obtain execution trace has been added. >> >> Ready? > > I'm about to send in a V3 that includes an updated design doc > and addresses most of the clang-format suggestions. > > The CI build reports that my V3 collides with a change > added yes

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-01-30 Thread Denton Liu
On Tue, Jan 29, 2019 at 02:15:36PM -0800, Junio C Hamano wrote: > * dl/merge-cleanup-scissors-fix (2019-01-27) 5 commits > - init docs: correct a punctuation typo > - merge: add scissors line on merge conflict > - merge: cleanup messages like commit > - t7600: clean up 'merge --squash c3 with c

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-01-30 Thread Jeff Hostetler
On 1/29/2019 5:15 PM, Junio C Hamano wrote: * jh/trace2 (2019-01-28) 14 commits - trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh - trace2:data: add subverb for rebase - trace2:data: add subverb to reset command - trace2:data: add subverb to checkout command - pack-object

What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-01-29 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. The fourth batch of topics are in