Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-26 Thread Stefan Beller
On Fri, Jun 23, 2017 at 6:01 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> But for the purpose of this "moved line coloring", >> excluding multiple copy destinations of the same thing may be a >> simpler and more robust solution. It will not catch "somebody >> stupidly removed one func

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Junio C Hamano
Junio C Hamano writes: > But for the purpose of this "moved line coloring", > excluding multiple copy destinations of the same thing may be a > simpler and more robust solution. It will not catch "somebody > stupidly removed one function and made two private copies", though. Let me take this on

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Junio C Hamano
Stefan Beller writes: > * add some heuristic to omit small blobs, (empty lines, closing braces) > Maybe this is can be solved by not considering anything > that occurs multiple times? I vaguely recall that we had to do something similar in "blame -C" where it tries to avoid passing blame for

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > This is bad: > > $ ./git --exec-path=$PWD -c diff.colorMoved=crap show > fatal: unable to parse 'diff.colormoved' from command-line config > > Fixed with: > > diff --git a/diff.c b/diff.c > index 7cae4f1ddb..036dbc1c3c 100644 > --- a/diff.c >

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Junio C Hamano
Junio C Hamano writes: >>> * ab/sha1dc (2017-06-07) 2 commits >>> ... >>> Will keep in 'pu'. >>> Impact to the various build and release infrastructure of using >>> submodule is not yet fully known, but this lets us dip our toes. >> ... >> But it's been 1 month kicking around in pu now. What a

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Stefan Beller
> This is good: > > $ ./git --exec-path=$PWD show --color-moved=crap > fatal: bad --color-moved argument: crap > > This is bad: > > $ ./git --exec-path=$PWD -c diff.colorMoved=crap show > fatal: unable to parse 'diff.colormoved' from command-line config > > Fixed with: > > diff

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Stefan Beller
On Fri, Jun 23, 2017 at 2:59 PM, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Jun 22 2017, Junio C. Hamano jotted: > >> * sb/diff-color-move (2017-06-21) 25 commits >> - diff: document the new --color-moved setting >> - diff.c: add dimming to moved line detection >> - diff.c: color moved lines di

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 22 2017, Junio C. Hamano jotted: > * sb/diff-color-move (2017-06-21) 25 commits > - diff: document the new --color-moved setting > - diff.c: add dimming to moved line detection > - diff.c: color moved lines differently, plain mode > - diff.c: color moved lines differently > - dif

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-23 Thread Lars Schneider
> On 23 Jun 2017, at 00:35, 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

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-22 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Thu, Jun 22 2017, Junio C. Hamano jotted: > >> * sd/branch-copy (2017-06-18) 3 commits >> - branch: add a --copy (-c) option to go with --move (-m) >> - branch: add test for -m renaming multiple config sections >> - config: create a function to format secti

Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-22 Thread Ævar Arnfjörð Bjarmason
On Thu, Jun 22 2017, Junio C. Hamano jotted: > * sd/branch-copy (2017-06-18) 3 commits > - branch: add a --copy (-c) option to go with --move (-m) > - branch: add test for -m renaming multiple config sections > - config: create a function to format section headers > > "git branch" learned "-c

What's cooking in git.git (Jun 2017, #06; Thu, 22)

2017-06-22 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. You can find the changes described