Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-08 Thread Patrick Steinhardt
On Mon, Dec 07, 2015 at 11:24:52AM -0800, Junio C Hamano wrote: > Patrick Steinhardt writes: > > > On Wed, Dec 02, 2015 at 05:31:14PM -0500, Jeff King wrote: > >> On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > > [snip] > >> > "--keep-empty" has always been about keeping an orig

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-07 Thread Junio C Hamano
Patrick Steinhardt writes: > On Wed, Dec 02, 2015 at 05:31:14PM -0500, Jeff King wrote: >> On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > [snip] >> > "--keep-empty" has always been about keeping an originally empty >> > commit, not a commit that becomes empty because of rebasin

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-07 Thread Patrick Steinhardt
On Wed, Dec 02, 2015 at 05:31:14PM -0500, Jeff King wrote: > On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: [snip] > > "--keep-empty" has always been about keeping an originally empty > > commit, not a commit that becomes empty because of rebasing > > (i.e. what has already been ap

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread brian m. carlson
On Wed, Dec 02, 2015 at 07:29:40PM -0500, David Turner wrote: > From a selfish perspective, I, would prefer for object-ids to not happen > quite yet for the refs code. I have already prepared (but not yet sent) > a new version of the refs backend vtable (and lmdb) code on top of > refs-backend-pre

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread Junio C Hamano
Jeff King writes: > On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > >> I think I managed to get my working area (together with a handful of >> new entries in the rerere database and a few merge-fix/ entries) in >> sync with what you pushed out well enough that my automated >> pr

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread David Turner
On Wed, 2015-12-02 at 14:11 -0800, Junio C Hamano wrote: > Jeff King writes: > > > What's cooking in git.git (Dec 2015, #01; Tue, 1) > > -- > > > > Here are the topics that have been cooking. Commits prefixed with > > '-' are only in 'pu' (proposed

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread Junio C Hamano
Jeff King writes: > On Wed, Dec 02, 2015 at 03:31:41PM -0800, Junio C Hamano wrote: > >> I just finished my first pass of going through "cook -w" output and >> had trouble judging jk/send-email-ssl-errors topic, which is marked >> as "waiting for re-roll", but I cannot seem to find any discussion

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread Jeff King
On Wed, Dec 02, 2015 at 03:31:41PM -0800, Junio C Hamano wrote: > I just finished my first pass of going through "cook -w" output and > had trouble judging jk/send-email-ssl-errors topic, which is marked > as "waiting for re-roll", but I cannot seem to find any discussion > on it, just the origina

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread Junio C Hamano
Jeff King writes: > On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > >> I think I managed to get my working area (together with a handful of >> new entries in the rerere database and a few merge-fix/ entries) in >> sync with what you pushed out well enough that my automated >> pr

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread Jeff King
On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > I think I managed to get my working area (together with a handful of > new entries in the rerere database and a few merge-fix/ entries) in > sync with what you pushed out well enough that my automated > procedure would recreate the

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

2015-12-02 Thread Junio C Hamano
Jeff King writes: > What's cooking in git.git (Dec 2015, #01; Tue, 1) > -- > > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. > > This sho