Re: [ANNOUNCE] Git v2.15.0-rc0

2017-10-05 Thread Stefan Beller 
+ Rene
- kernel mailing list

On Thu, Oct 5, 2017 at 6:10 AM, Johannes Schindelin
 wrote:
> Hi Junio,
>
> On Thu, 5 Oct 2017, Junio C Hamano wrote:
>
>> New contributors whose contributions weren't in v2.14.0 are as follows.
>> Welcome to the Git development community!
>>
>>   Ann T Ropea, Daniel Watkins, Dimitrios Christidis, Eric Rannaud,
>>   Evan Zacks, Hielke Christian Braun, Ian Campbell, Ilya Kantor,
>>   Jameson Miller, Job Snijders, Joel Teichroeb, joernchen,
>>   Łukasz Gryglicki, Manav Rathi, Martin Ågren, Michael Forney,
>>   Patryk Obara, Rene Scharfe, Ross Kabus, and Urs Thuermann.
>   
>
> I think we need a .mailmap entry there... I guess the difference is the é
> vs e.
>
> Ciao,
> Dscho

Using the snippets from 94b410bba8 (.mailmap: Map email addresses
to names, 2013-07-12), I cc'd more people.

# Finding out duplicates by comparing email addresses:
git shortlog -sne |awk '{ print $NF }' |sort |uniq -d
 
 
 
 
 
 

Looking for duplicate names yields a lot of people, too:

# Finding out duplicates by comparing names:
git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
 Adam Simpkins
 Alex Riesen
 Andreas Ericsson
 Andreas Schwab
 anonymous
 Avery Pennarun
 Beat Bolli
 Benoit Person
 Brian Gernhardt
 Carlos Martín Nieto
 Charles Bailey
 Clemens Buchacher
 Daniel Knittl-Frank
 David Barr
 David Turner
 Dotan Barak
 Edward Thomson
 Grégoire Paris
 Hartmut Henkel
 Jacob Keller
 Jason McMullan
 Jean-Noel Avila
 Jean-Noël AVILA
 Jiang Xin
 Joachim Jablon
 Joey Hess
 Jonathon Mah
 Kacper Kornet
 Kirill A. Shutemov
 Kirill Smelkov
 Kristian Høgsberg
 Lars Schneider
 Lukas Fleischer
 Marius Storm-Olsen
 Martin Koegler
 Martin Langhoff
 Matthieu Moy
 Michael Coleman
 Mike Ralphson
 Nick Alcock
 Nicolas Morey-Chaisemartin
 Olaf Hering
 Orgad Shaneh
 Paolo Bonzini
 Patrick Welche
 Paul Mackerras
 Raman Gupta
 Ray Chen
 Roberto Tyley
 Sam Hocevar
 Sven Strickroth
 Thorsten Glaser
 Tom G. Christensen
 Vitaly "_Vi" Shukela
 William Duclot
 Дилян Палаузов

Re: [ANNOUNCE] Git v2.15.0-rc0

2017-10-05 Thread Johannes Schindelin 
Hi Junio,

On Thu, 5 Oct 2017, Junio C Hamano wrote:

> New contributors whose contributions weren't in v2.14.0 are as follows.
> Welcome to the Git development community!
> 
>   Ann T Ropea, Daniel Watkins, Dimitrios Christidis, Eric Rannaud,
>   Evan Zacks, Hielke Christian Braun, Ian Campbell, Ilya Kantor,
>   Jameson Miller, Job Snijders, Joel Teichroeb, joernchen,
>   Łukasz Gryglicki, Manav Rathi, Martin Ågren, Michael Forney,
>   Patryk Obara, Rene Scharfe, Ross Kabus, and Urs Thuermann.
  

I think we need a .mailmap entry there... I guess the difference is the é
vs e.

Ciao,
Dscho

Re: [ANNOUNCE] Git v2.15.0-rc0

2017-10-05 Thread Jeff King 
On Thu, Oct 05, 2017 at 02:55:31PM +0900, Junio C Hamano wrote:

> Git 2.15 Release Notes (draft)
> ==
> 
> Backward compatibility notes and other notable changes.
> 
>  * Use of an empty string as a pathspec element that is used for
>'everything matches' is still warned and Git asks users to use a
>more explicit '.' for that instead.  The hope is that existing
>users will not mind this change, and eventually the warning can be
>turned into a hard error, upgrading the deprecation into removal of
>this (mis)feature.  That is now scheduled to happen in the upcoming
>release.

I wasn't sure if this "upcoming" meant v2.15 ("the upcoming release that
we're about to tag") or v2.16. Judging from "What's cooking" it's the
latter, but perhaps we should be more explicit. I don't know if you are
hesitant to name it "v2.16" at this point, but maybe:

  ...in the upcoming release (i.e., the one after v2.15).

would help.

>  * Git now avoids blindly falling back to ".git" when the setup
>sequence said we are _not_ in Git repository.  A corner case that
>happens to work right now may be broken by a call to die("BUG").

An even more minor nit. This is now BUG(). :)

I don't think it matters for our purposes here, of course. But I did
wonder how long we'd want to carry this warning in the notes. I think it
goes back to v2.13. Of course people sometimes jump several versions
without necessarily reading the interim release notes, so it makes sense
to carry it for a while.

-Peff

[ANNOUNCE] Git v2.15.0-rc0

2017-10-04 Thread Junio C Hamano 
An early preview release Git v2.15.0-rc0 is now available for
testing at the usual places.  It is comprised of 672 non-merge
commits since v2.14.0, contributed by 66 people, 20 of which are
new faces.

The tarballs are found at:

https://www.kernel.org/pub/software/scm/git/testing/

The following public repositories all have a copy of the
'v2.15.0-rc0' tag and the 'master' branch that the tag points at:

  url = https://kernel.googlesource.com/pub/scm/git/git
  url = git://repo.or.cz/alt-git.git
  url = https://github.com/gitster/git

New contributors whose contributions weren't in v2.14.0 are as follows.
Welcome to the Git development community!

  Ann T Ropea, Daniel Watkins, Dimitrios Christidis, Eric Rannaud,
  Evan Zacks, Hielke Christian Braun, Ian Campbell, Ilya Kantor,
  Jameson Miller, Job Snijders, Joel Teichroeb, joernchen,
  Łukasz Gryglicki, Manav Rathi, Martin Ågren, Michael Forney,
  Patryk Obara, Rene Scharfe, Ross Kabus, and Urs Thuermann.

Returning contributors who helped this release are as follows.
Thanks for your continued support.

  Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Andreas Heiduk,
  Anthony Sottile, Ben Boeckel, Brandon Casey, Brandon Williams,
  brian m. carlson, Christian Couder, Eric Blake, Han-Wen Nienhuys,
  Heiko Voigt, Jeff Hostetler, Jeff King, Johannes Schindelin,
  Jonathan Nieder, Jonathan Tan, Junio C Hamano, Kaartic Sivaraam,
  Kevin Daudt, Kevin Willford, Lars Schneider, Martin Koegler,
  Matthieu Moy, Max Kirillov, Michael Haggerty, Michael J Gruber,
  Nguyễn Thái Ngọc Duy, Nicolas Morey-Chaisemartin, Øystein
  Walle, Paolo Bonzini, Pat Thoyts, Philip Oakley, Phillip
  Wood, Raman Gupta, Ramsay Jones, René Scharfe, Sahil Dua,
  Santiago Torres, Stefan Beller, Stephan Beyer, Takashi Iwai,
  Thomas Gummerer, Tom G. Christensen, Torsten Bögershausen,
  and William Duclot.



Git 2.15 Release Notes (draft)
==

Backward compatibility notes and other notable changes.

 * Use of an empty string as a pathspec element that is used for
   'everything matches' is still warned and Git asks users to use a
   more explicit '.' for that instead.  The hope is that existing
   users will not mind this change, and eventually the warning can be
   turned into a hard error, upgrading the deprecation into removal of
   this (mis)feature.  That is now scheduled to happen in the upcoming
   release.

 * Git now avoids blindly falling back to ".git" when the setup
   sequence said we are _not_ in Git repository.  A corner case that
   happens to work right now may be broken by a call to die("BUG").
   We've tried hard to locate such cases and fixed them, but there
   might still be cases that need to be addressed--bug reports are
   greatly appreciated.

 * "branch --set-upstream" that has been deprecated in Git 1.8 has
   finally been retired.


Updates since v2.14
---

UI, Workflows & Features

 * An example that is now obsolete has been removed from a sample hook,
   and an old example in it that added a sign-off manually has been
   improved to use the interpret-trailers command.

 * The advice message given when "git rebase" stops for conflicting
   changes has been improved.

 * The "rerere-train" script (in contrib/) learned the "--overwrite"
   option to allow overwriting existing recorded resolutions.

 * "git contacts" (in contrib/) now lists the address on the
   "Reported-by:" trailer to its output, in addition to those on
   S-o-b: and other trailers, to make it easier to notify (and thank)
   the original bug reporter.

 * "git rebase", especially when it is run by mistake and ends up
   trying to replay many changes, spent long time in silence.  The
   command has been taught to show progress report when it spends
   long time preparing these many changes to replay (which would give
   the user a chance to abort with ^C).

 * "git merge" learned a "--signoff" option to add the Signed-off-by:
   trailer with the committer's name.

 * "git diff" learned to optionally paint new lines that are the same
   as deleted lines elsewhere differently from genuinely new lines.

 * "git interpret-trailers" learned to take the trailer specifications
   from the command line that overrides the configured values.

 * "git interpret-trailers" has been taught a "--parse" and a few
   other options to make it easier for scripts to grab existing
   trailer lines from a commit log message.

 * "gitweb" shows a link to visit the 'raw' contents of blbos in the
   history overview page.

 * "[gc] rerereResolved = 5.days" used to be invalid, as the variable
   is defined to take an integer counting the number of days.  It now
   is allowed.

 * The code to acquire a lock on a reference (e.g. while accepting a
   push from a client) used to immediately fail when the reference is
   already locked---now it waits for a very short while and retries,
   which can make it succeed if the