From: Trevor Saunders <tsaunders@mozilla.com>
Date: Mon, 21 Jul 2014 07:39:40 +0000 (+0000)
Subject: contrib/
X-Git-Tag: releases/gcc-5.1.0~6179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=863aa163a0dd338c392485f72e32e95ee516f2e8;p=thirdparty%2Fgcc.git

contrib/
2014-07-21  Trevor Saunders  <tsaunders@mozilla.com>

	mklog: Read name and email from git config when available.

From-SVN: r212883
---

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 3a94c98da90b..b714b88eff9b 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-21  Trevor Saunders  <tsaunders@mozilla.com>
+
+	mklog: Read name and email from git config when available.
+
 2014-06-28  Richard Biener  <rguenther@suse.de>
 
 	* gennews: Use gcc-3.0/index.html.
diff --git a/contrib/mklog b/contrib/mklog
index fb489b03a3bf..5f5d98e9f4df 100755
--- a/contrib/mklog
+++ b/contrib/mklog
@@ -38,6 +38,20 @@ $gcc_root = $0;
 $gcc_root =~ s/[^\\\/]+$/../;
 chdir $gcc_root;
 
+# if this is a git tree then take name and email from the git configuration
+if (-d .git) {
+  $gitname = `git config user.name`;
+  chomp($gitname);
+  if ($gitname) {
+	  $name = $gitname;
+  }
+
+  $gitaddr = `git config user.email`;
+  chomp($gitaddr);
+  if ($gitaddr) {
+	  $addr = $gitaddr;
+  }
+}
 
 #-----------------------------------------------------------------------------
 # Program starts here. You should not need to edit anything below this