Re: merge-recursive, was Re: What's in git.git

3 messages, 3 authors, 2016-08-11 · open the first message on its own page

Re: merge-recursive, was Re: What's in git.git

From: Junio C Hamano <hidden>
Date: 2016-08-11 20:46:27

Jakub Narebski [off-list ref] writes:
Johannes Schindelin wrote:
quoted
BTW what happened to the builtin shortlog? It is the last Perl script I 
use regularly... (should make people happy who are stuck with Activision 
Perl...)
BTW. both Perl version and builtin shorlog have email->real name translation
table built in. In Perl script version it is in __DATA__ section, and we
could update it using Inline::Files module, in C version it was in table.
But in fact this list is project specific. Shouldn't we make it customizable
(::sigh::, yet another file in $GIT_DIR...).
It already reads from .mailmap which could be tracked as part of
the sources (if it is project specific it would be better if it
can be shared among members).

Re: merge-recursive, was Re: What's in git.git

From: Jakub Narebski <hidden>
Date: 2016-08-11 19:37:06

Junio C Hamano wrote:
Jakub Narebski [off-list ref] writes:
quoted
BTW. both Perl version and builtin shorlog have email->real name translation
table built in. In Perl script version it is in __DATA__ section, and we
could update it using Inline::Files module, in C version it was in table.
But in fact this list is project specific. Shouldn't we make it customizable
(::sigh::, yet another file in $GIT_DIR...).
It already reads from .mailmap which could be tracked as part of
the sources (if it is project specific it would be better if it
can be shared among members).
By the way, if I read code correctly, it read '.mailmap' from _current_
directory. Shouldn't it read qx(git-rev-parse --show-cdup)/.mailmap ?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

Re: merge-recursive, was Re: What's in git.git

From: Nicolas Pitre <hidden>
Date: 2016-08-11 20:06:41

On Thu, 26 Oct 2006, Junio C Hamano wrote:
Jakub Narebski [off-list ref] writes:
quoted
Johannes Schindelin wrote:
quoted
BTW what happened to the builtin shortlog? It is the last Perl script I 
use regularly... (should make people happy who are stuck with Activision 
Perl...)
BTW. both Perl version and builtin shorlog have email->real name translation
table built in. In Perl script version it is in __DATA__ section, and we
could update it using Inline::Files module, in C version it was in table.
But in fact this list is project specific. Shouldn't we make it customizable
(::sigh::, yet another file in $GIT_DIR...).
It already reads from .mailmap which could be tracked as part of
the sources (if it is project specific it would be better if it
can be shared among members).
The C version was missing that support if I remember right.

Actually I think that the email table should be removed out of the tool 
entirely and always read from .mailmap instead.

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help