Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-02 Thread Jeff King
On Fri, Aug 02, 2019 at 09:53:55AM -0700, Junio C Hamano wrote: > Jonathan Nieder writes: > > > We'll also want to update the docs. And as Todd suggests, we should > > cover how to disable mailmap in tests. > > > > Signed-off-by: Jonathan Nieder > > --- > > I avoided the "don't bother initial

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-02 Thread Junio C Hamano
Jonathan Nieder writes: > We'll also want to update the docs. And as Todd suggests, we should > cover how to disable mailmap in tests. > > Signed-off-by: Jonathan Nieder > --- I avoided the "don't bother initializing use_mailmap_config to unknown" simplification, but I guess the change is clea

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Jonathan Nieder
Junio C Hamano wrote: > I suspect that you may have misread the "is interactive" bit in the > original; that was used only to decide if we are going to warn. Ah. That was indeed confusing. Anyway, it's nice to see the complexity go away. [...] > +++ b/builtin/log.c [...] > @@ -214,12 +204,8 @@

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Todd Zullinger
Junio C Hamano wrote: > Junio C Hamano writes: > >> Jeff King writes: >> + if (mailmap < 0) mailmap = 0; - } >>> >>> This should be "mailmap = 1" to match the commit message, no? (Which >>> also implies we may want a new test). >> [...] > +test_expect_success 'log.mai

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >>> + if (mailmap < 0) >>> mailmap = 0; >>> - } >> >> This should be "mailmap = 1" to match the commit message, no? (Which >> also implies we may want a new test). > > Gaa, of course. -- >8 -- From: Junio C Hamano Date: Thu, 1 Aug 20

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Junio C Hamano
Jeff King writes: >> +if (mailmap < 0) >> mailmap = 0; >> -} > > This should be "mailmap = 1" to match the commit message, no? (Which > also implies we may want a new test). Gaa, of course. > I'd also be OK with leaving it at "0" for now, making a note of the > upcoming cha

Re: [git-for-windows] Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Johannes Schindelin
Hi Bryan, On Wed, 31 Jul 2019, Bryan Turner wrote: > On Wed, Jul 31, 2019 at 5:43 AM Johannes Schindelin > wrote: > > > > Hi, > > > > On Mon, 29 Jul 2019, Junio C Hamano wrote: > > > > > An early preview release Git v2.23.0-rc0 is now available for > > > testing at the usual places. It is compr

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Johannes Schindelin
Hi, On Wed, 31 Jul 2019, Ariadne Conill wrote: > Hello, > > On Wed, Jul 31, 2019 at 10:21 PM Junio C Hamano wrote: > > > > Jeff King writes: > > > > > This seems OK to me, though I kind of wonder if anybody really wants > > > "auto". Unlike log.decorate, which changes the syntax, there is no re

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Jeff King
On Thu, Aug 01, 2019 at 08:45:54AM -0700, Junio C Hamano wrote: > While I think "revert to hardcoded default" may be a good idea, I do > not think the hardcoded default you implemented that changes the > behaviour based on the output destination makes much sense. If I > want to eradicate jun...@c

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Ariadne Conill
Hello, On Thu, Aug 1, 2019 at 10:46 AM Junio C Hamano wrote: > > Jonathan Nieder writes: > > > Although as Dscho mentions, it's particularly irritating because it is > > not part of the paginated output. > > ... > > Let's bite the bullet and jump straight to --use-mailmap in case (4). > > > > Wh

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-08-01 Thread Junio C Hamano
Jonathan Nieder writes: > Although as Dscho mentions, it's particularly irritating because it is > not part of the paginated output. > ... > Let's bite the bullet and jump straight to --use-mailmap in case (4). > > While at it, add a new log.mailmap setting "auto" that can be used to > explicitly

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Ariadne Conill
Hello, On Wed, Jul 31, 2019 at 10:21 PM Junio C Hamano wrote: > > Jeff King writes: > > > This seems OK to me, though I kind of wonder if anybody really wants > > "auto". Unlike log.decorate, which changes the syntax, there is no real > > reason to avoid mailmap when somebody else is parsing the

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Junio C Hamano
Jeff King writes: > This seems OK to me, though I kind of wonder if anybody really wants > "auto". Unlike log.decorate, which changes the syntax, there is no real > reason to avoid mailmap when somebody else is parsing the output. And I > could imagine it is especially confusing if: > > git log

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Jeff King
On Wed, Jul 31, 2019 at 08:38:14PM -0500, Ariadne Conill wrote: > > Something like: > > > > Author: A U Thor > > Original-Author: I M Mailmapped > > > > gives even more information while leaving the "Author:" line untouched. > > But in introducing a new line, it may also be breaking somebody

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Ariadne Conill
Hello, On Wed, Jul 31, 2019 at 8:00 PM Jeff King wrote: > > On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote: > > > Although as Dscho mentions, it's particularly irritating because it is > > not part of the paginated output. > > > > I wonder if the ideal might not be to trigger it

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Jonathan Nieder
Jeff King wrote: > This seems OK to me, though I kind of wonder if anybody really wants > "auto". Sure. It's just the usual way of handling the lack of support for an "unset" directive in git's config syntax (for example, if a script author wants to test the default behavior). Thanks, Jonathan

Re: [git-for-windows] Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Bryan Turner
On Wed, Jul 31, 2019 at 5:43 AM Johannes Schindelin wrote: > > Hi, > > On Mon, 29 Jul 2019, Junio C Hamano wrote: > > > An early preview release Git v2.23.0-rc0 is now available for > > testing at the usual places. It is comprised of 420 non-merge > > commits since v2.22.0, contributed by 62 peop

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Jeff King
On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote: > Although as Dscho mentions, it's particularly irritating because it is > not part of the paginated output. > > I wonder if the ideal might not be to trigger it more selectively, when > the output actually changed due to a reflog e

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Ariadne Conill
Hello, On Wed, Jul 31, 2019 at 7:21 PM Jonathan Nieder wrote: > > Jeff King wrote: > > > I think part of what my annoyance is responding to (and your willingness > > to just squelch this for everybody) is that switching this particular > > default isn't really that big a deal, that it requires an

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Jonathan Nieder
Jeff King wrote: > I think part of what my annoyance is responding to (and your willingness > to just squelch this for everybody) is that switching this particular > default isn't really that big a deal, that it requires annoying people > on every single "git log" invocation. Perhaps we would be b

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Jeff King
On Wed, Jul 31, 2019 at 02:43:10PM +0200, Johannes Schindelin wrote: > And a corresponding Git for Windows v2.23.0-rc0 can be found here: > > https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1 > > Please test! > > One (slightly annoying) issue I found already is that a `g

Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

2019-07-31 Thread Johannes Schindelin
Hi, On Mon, 29 Jul 2019, Junio C Hamano wrote: > An early preview release Git v2.23.0-rc0 is now available for > testing at the usual places. It is comprised of 420 non-merge > commits since v2.22.0, contributed by 62 people, 23 of which are > new faces. > > The tarballs are found at: > > ht