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

2018-04-11 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 11 2018, Jakub Narebski wrote: > Junio C Hamano writes: > > >> * ab/nuke-emacs-contrib (2018-03-13) 1 commit >> (merged to 'next' on 2018-03-15 at 13eb4e2d8b) >> + git{,-blame}.el: remove old bitrotting Emacs code >> >> The scripts in contrib/emacs/ have

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

2018-04-11 Thread Jakub Narebski
Junio C Hamano writes: > * ab/nuke-emacs-contrib (2018-03-13) 1 commit > (merged to 'next' on 2018-03-15 at 13eb4e2d8b) > + git{,-blame}.el: remove old bitrotting Emacs code > > The scripts in contrib/emacs/ have outlived their usefulness and > have been removed. > >

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

2018-04-11 Thread Phillip Wood
On 09/04/18 11:21, Junio C Hamano wrote: * pw/add-p-select (2018-03-16) 3 commits (merged to 'next' on 2018-03-30 at eae69f5ded) + add -p: optimize line selection for short hunks + add -p: allow line selection to be inverted + add -p: select individual hunk lines "git add -p"

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Wed, 11 Apr 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Mon, 9 Apr 2018, Junio C Hamano wrote: > > > >> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits > >> * bp/git-gui-bind-kp-enter (2018-03-02) 2 commits > >> *

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Stefan Beller
On Tue, Apr 10, 2018 at 2:38 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> On Mon, 9 Apr 2018, Junio C Hamano wrote: >> >>> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits This looks good to me. Please merge down. >>> *

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

2018-04-10 Thread Junio C Hamano
Derrick Stolee writes: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> I guess we'd want a final cleaned-up round after all ;-) Thanks. > > v8 sent [1]. Thanks. Thanks, will take a look and queue.

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Junio C Hamano
Johannes Schindelin writes: > On Mon, 9 Apr 2018, Junio C Hamano wrote: > >> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits >> * bp/git-gui-bind-kp-enter (2018-03-02) 2 commits >> * cb/git-gui-ttk-style (2018-03-05) 2 commits > > What is your plan with those? I

git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Mon, 9 Apr 2018, Junio C Hamano wrote: > * bb/git-gui-ssh-key-files (2018-03-02) 2 commits > - Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files > - git-gui: search for all current SSH key types > > "git gui" learned that "~/.ssh/id_ecdsa.pub" and >

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

2018-04-10 Thread Ramsay Jones
On 10/04/18 21:22, Ramsay Jones wrote: > > > On 10/04/18 20:35, Derrick Stolee wrote: >> On 4/10/2018 3:21 PM, Ramsay Jones wrote: >>> >>> On 10/04/18 13:57, Derrick Stolee wrote: On 4/9/2018 6:08 PM, Junio C Hamano wrote: > I guess we'd want a final cleaned-up round after all ;-) 

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

2018-04-10 Thread Ramsay Jones
On 10/04/18 20:35, Derrick Stolee wrote: > On 4/10/2018 3:21 PM, Ramsay Jones wrote: >> >> On 10/04/18 13:57, Derrick Stolee wrote: >>> On 4/9/2018 6:08 PM, Junio C Hamano wrote: I guess we'd want a final cleaned-up round after all ;-)  Thanks. >>> v8 sent [1]. Thanks. >> I just tried to

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

2018-04-10 Thread Derrick Stolee
On 4/10/2018 3:21 PM, Ramsay Jones wrote: On 10/04/18 13:57, Derrick Stolee wrote: On 4/9/2018 6:08 PM, Junio C Hamano wrote: I guess we'd want a final cleaned-up round after all ;-)  Thanks. v8 sent [1]. Thanks. I just tried to 'git am' this series and I could not get it to apply cleanly

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

2018-04-10 Thread Ramsay Jones
On 10/04/18 13:57, Derrick Stolee wrote: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> I guess we'd want a final cleaned-up round after all ;-)  Thanks. > > v8 sent [1]. Thanks. I just tried to 'git am' this series and I could not get it to apply cleanly to current 'master', 'next' or

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

2018-04-10 Thread Stefan Beller
On Tue, Apr 10, 2018 at 5:57 AM, Derrick Stolee wrote: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> >> I guess we'd want a final cleaned-up round after all ;-) Thanks. > > > v8 sent [1]. Thanks. > > -Stolee I gave the series another read and think it is ready. Stefan

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

2018-04-10 Thread Derrick Stolee
On 4/9/2018 6:08 PM, Junio C Hamano wrote: I guess we'd want a final cleaned-up round after all ;-) Thanks. v8 sent [1]. Thanks. -Stolee [1] https://public-inbox.org/git/20180410125608.39443-1-dsto...@microsoft.com/T/#u

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

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Mon, 9 Apr 2018, Junio C Hamano wrote: > * js/t5404-path-fix (2018-04-09) 1 commit > - t5404: relax overzealous test > > Test fix. Please note that it is not a "path fix". It is a fix for when the test is looking for an error message, and may currently mistake something else for

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

2018-04-09 Thread Junio C Hamano
Ramsay Jones writes: > On 09/04/18 14:37, Derrick Stolee wrote: >> On 4/9/2018 6:21 AM, Junio C Hamano wrote: >>> * ds/commit-graph (2018-04-02) 16 commits >>>   - commit-graph: implement "--additive" option >>> ... >>>   Ready??? >>>   It seems that this topic is

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

2018-04-09 Thread Johannes Schindelin
Hi, On Mon, 9 Apr 2018, Johannes Schindelin wrote: > On Mon, 9 Apr 2018, Junio C Hamano wrote: > > > * js/rebase-recreate-merge (2018-02-23) 12 commits (merged to 'next' > > on 2018-03-15 at 3d1671756f) + rebase -i: introduce > > --recreate-merges=[no-]rebase-cousins + pull: accept

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

2018-04-09 Thread Johannes Schindelin
Hi Junio, On Mon, 9 Apr 2018, Junio C Hamano wrote: > * js/rebase-recreate-merge (2018-02-23) 12 commits > (merged to 'next' on 2018-03-15 at 3d1671756f) > + rebase -i: introduce --recreate-merges=[no-]rebase-cousins > + pull: accept --rebase=recreate to recreate the branch topology > +

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

2018-04-09 Thread Stefan Beller
On Mon, Apr 9, 2018 at 8:31 AM, Duy Nguyen wrote: > On Mon, Apr 9, 2018 at 12:21 PM, Junio C Hamano wrote: >> * sb/packfiles-in-repository (2018-03-26) 12 commits >> (merged to 'next' on 2018-03-30 at caa68db14d) >> + packfile: keep prepare_packed_git()

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

2018-04-09 Thread Ramsay Jones
On 09/04/18 14:37, Derrick Stolee wrote: > On 4/9/2018 6:21 AM, Junio C Hamano wrote: >> * ds/commit-graph (2018-04-02) 16 commits >>   - commit-graph: implement "--additive" option >>   - commit-graph: build graph from starting commits >>   - commit-graph: read only from specific pack-indexes

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

2018-04-09 Thread Duy Nguyen
On Mon, Apr 9, 2018 at 12:21 PM, Junio C Hamano wrote: > * sb/packfiles-in-repository (2018-03-26) 12 commits > (merged to 'next' on 2018-03-30 at caa68db14d) > + packfile: keep prepare_packed_git() private > + packfile: allow find_pack_entry to handle arbitrary

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

2018-04-09 Thread Derrick Stolee
On 4/9/2018 6:21 AM, Junio C Hamano wrote: * ds/commit-graph (2018-04-02) 16 commits - commit-graph: implement "--additive" option - commit-graph: build graph from starting commits - commit-graph: read only from specific pack-indexes - commit: integrate commit graph with commit parsing

What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-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. I try to summarize what each