Re: pw/add-p-select, was Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2019-01-22 Thread Phillip Wood
Hi Dscho On 21/01/2019 20:58, Johannes Schindelin wrote: Hi Phillip, On Tue, 11 Dec 2018, Phillip Wood wrote: On 11/12/2018 09:56, Johannes Schindelin wrote: On Mon, 10 Dec 2018, Phillip Wood wrote: On 09/12/2018 20:31, Johannes Schindelin wrote: I could imagine, however, that it would

Re: pw/add-p-select, was Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2019-01-21 Thread Johannes Schindelin
Hi Phillip, On Tue, 11 Dec 2018, Phillip Wood wrote: > On 11/12/2018 09:56, Johannes Schindelin wrote: > > > On Mon, 10 Dec 2018, Phillip Wood wrote: > > > > > On 09/12/2018 20:31, Johannes Schindelin wrote: > > > > > > > I could imagine, however, that it would make sense for `git add > > > >

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-16 Thread Alban Gruin
Hi Junio, Le 09/12/2018 à 09:42, Junio C Hamano a écrit :> -%<- > * ag/sequencer-reduce-rewriting-todo (2018-11-12) 16 commits > . rebase--interactive: move transform_todo_file() to rebase--interactive.c > . sequencer: fix a call to error() in transform_todo_file() > . sequencer: use edit_todo_

Re: pw/add-p-select, was Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-11 Thread Phillip Wood
Hi Dscho and Slavica On 11/12/2018 09:56, Johannes Schindelin wrote: Hi Phillip, [Cc:ing Slavica, the Outreachy intern working on converting `add -i` to a built-in] On Mon, 10 Dec 2018, Phillip Wood wrote: On 09/12/2018 20:31, Johannes Schindelin wrote: (which I take as being inspired

Re: pw/add-p-select, was Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-11 Thread Johannes Schindelin
Hi Phillip, [Cc:ing Slavica, the Outreachy intern working on converting `add -i` to a built-in] On Mon, 10 Dec 2018, Phillip Wood wrote: > On 09/12/2018 20:31, Johannes Schindelin wrote: > > > > On Sun, 9 Dec 2018, Junio C Hamano wrote: > > > > > * pw/add-p-select (2018-07-26) 4 commits > > >

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Junio C Hamano
Stefan Beller writes: > I saw you picked up the latest iteration of the last patch at > https://public-inbox.org/git/20181206212655.145586-1-sbel...@google.com/ > which has received no review comments, yet, and you seem to have > just taken it for replacement without looking closely. What's ther

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Stefan Beller
> * sb/more-repo-in-api (2018-11-14) 23 commits > (merged to 'next' on 2018-11-19 at e5d2a129da) > [..] > The in-core repository instances are passed through more codepaths. > > Will cook in 'next'. > cf. <20181115221254.45373-1-jonathanta...@google.com> Looking into that. > * sb/submodule-r

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Related; Junio: I've submitted a few things in the last 2-3 weeks which > I knew weren't making it into 2.20, but I just wanted to kick out the > door as I had them ready. Things which are not noted in this "What's > Cooking". > > I'm fine with re-submitting thos

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Junio C Hamano
Elijah Newren writes: > On Sun, Dec 9, 2018 at 12:42 AM Junio C Hamano wrote: > >> Git 2.20 has been tagged. I'd expect that we would slow down to see >> how stable it is and queue only the brown-paper-bag fixes for a week >> or so, before opening the tree for the next cycle, rewinding the tip

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Junio C Hamano
Josh Steadmon writes: > On 2018.12.09 17:42, Junio C Hamano wrote: >> * js/protocol-advertise-multi (2018-11-17) 1 commit >> - protocol: advertise multiple supported versions >> >> The transport layer has been updated so that the protocol version >> used can be negotiated between the parties,

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Ævar Arnfjörð Bjarmason
On Mon, Dec 10 2018, Elijah Newren wrote: > On Sun, Dec 9, 2018 at 12:42 AM Junio C Hamano wrote: > >> Git 2.20 has been tagged. I'd expect that we would slow down to see >> how stable it is and queue only the brown-paper-bag fixes for a week >> or so, before opening the tree for the next cycl

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Elijah Newren
On Sun, Dec 9, 2018 at 12:42 AM Junio C Hamano wrote: > Git 2.20 has been tagged. I'd expect that we would slow down to see > how stable it is and queue only the brown-paper-bag fixes for a week > or so, before opening the tree for the next cycle, rewinding the tip > of 'next', etc. Does this m

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Josh Steadmon
On 2018.12.09 17:42, Junio C Hamano wrote: > * js/protocol-advertise-multi (2018-11-17) 1 commit > - protocol: advertise multiple supported versions > > The transport layer has been updated so that the protocol version > used can be negotiated between the parties, by the initiator > listing th

Re: pw/add-p-select, was Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Phillip Wood
Hi Dscho On 09/12/2018 20:31, Johannes Schindelin wrote: Hi Junio, On Sun, 9 Dec 2018, Junio C Hamano wrote: * pw/add-p-select (2018-07-26) 4 commits - add -p: optimize line selection for short hunks - add -p: allow line selection to be inverted - add -p: select modified lines correctly

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-10 Thread Junio C Hamano
Denton Liu writes: > On Mon, Dec 10, 2018 at 12:21:05PM +0900, Junio C Hamano wrote: > >> And the "story" is not "If you have remote.$name.url and want to >> move its value to remote.$name.pushurl while setting the former to a >> new value, then..." I want to know why the user gets in such a >>

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-09 Thread Denton Liu
On Mon, Dec 10, 2018 at 12:21:05PM +0900, Junio C Hamano wrote: > I think v3 (which we see above) describes what it wants to do > clearly enough and implements what it wants to do cleanly. I do not > think the patch itself has much room for further improvement. > > When I re-read the final patch

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-09 Thread Junio C Hamano
Denton Liu writes: > On Sun, Dec 09, 2018 at 05:42:27PM +0900, Junio C Hamano wrote: >> * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits >> (merged to 'next' on 2018-11-21 at 217be06acb) >> + merge: add scissors line on merge conflict >> + t7600: clean up 'merge --squash c3 with c7' tes

pw/add-p-select, was Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-09 Thread Johannes Schindelin
Hi Junio, On Sun, 9 Dec 2018, Junio C Hamano wrote: > * pw/add-p-select (2018-07-26) 4 commits > - add -p: optimize line selection for short hunks > - add -p: allow line selection to be inverted > - add -p: select modified lines correctly > - add -p: select individual hunk lines > > "git ad

Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-09 Thread Denton Liu
On Sun, Dec 09, 2018 at 05:42:27PM +0900, Junio C Hamano wrote: > * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits > (merged to 'next' on 2018-11-21 at 217be06acb) > + merge: add scissors line on merge conflict > + t7600: clean up 'merge --squash c3 with c7' test > > The list of conflic

What's cooking in git.git (Dec 2018, #01; Sun, 9)

2018-12-09 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. Git 2.20 has been tagged. I'd exp