Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com>
---
contrib/related/git-related | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index 9194777..3b11930 100755
--- a/contrib/related/git-related
+++ b/contrib/related/git-related
@@ -8,6 +8,9 @@ require 'optparse'
$since = '5-years-ago'
$min_percent = 10
+$mailmaps = {}
+$mailmaps_complex = {}
+
begin
OptionParser.new do |opts|
opts.program_name = 'git related'
@@ -23,6 +26,29 @@ begin
rescue OptionParser::InvalidOption
end
+def get_mailmap(filename)
+ return unless File.exists?(filename)
+ File.open(filename) do |f|
+ f.each do |line|
+ case line.gsub(/\s*#.*$/, '')
+ when /^([^<>]+)\s+<(\S+)>$/
+ $mailmaps[$2] = [ $1, nil ]
+ when /^<(\S+)>\s+<(\S+)>$/
+ $mailmaps[$2] = [ nil, $1 ]
+ when /^([^<>]+)\s+<(\S+)>\s+<(\S+)>$/
+ $mailmaps[$3] = [ $1, $2 ]
+ when /^([^<>]+)\s+<(\S+)>\s+([^<>]+)\s+<(\S+)>$/
+ $mailmaps_complex[[$3, $4]] = [ $1, $2 ]
+ end
+ end
+ end
+end
+
+get_aliases if $get_aliases
+get_mailmap('.mailmap')
+mailmap_file = %x[git config mailmap.file].chomp
+get_mailmap(mailmap_file)
+
KNOWN_ROLES = {
'Signed-off' => :signer,
'Reviewed' => :reviewer,
@@ -70,6 +96,17 @@ class Persons
end
def self.get(name, email)
+
+ # fix with mailmap
+ person = [name, email]
+ new = nil
+ new = $mailmaps_complex[person] if not new and
$mailmaps_complex.include?(person)
+ new = $mailmaps[email] if not new and $mailmaps.include?(email)
+ if new
+ name = new[0] if new[0]
+ email = new[1] if new[1]
+ end
+
id = email.downcase
person = @@index[id]
if not person
--
1.8.3.rc2.542.g24820ba
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
