aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authortbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>2016-03-06 17:36:19 +0000
committertbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>2016-03-06 17:36:19 +0000
commit5dde78191b24822271bc94b9bbe9bf36578e01b9 (patch)
tree5804bde429ee3a5939876792975aac4f00909a7d /contrib
parent5579a199aa5c8491a5885cde72716eb6310dc384 (diff)
teach mklog to look in the current directory for ChangeLog files
when run in repos other than gcc mklog fails to find ChangeLog files because it looks for $0/../$dir/ChangeLog, but of course if the diff is for a project other than gcc that might not exist. It should be fine to also look for $cwd/$dir/ChangeLog, and use that if we find it. This means that for example in binutils-gdb.git you can do git commit, and then in your editor read git diff HEAD~ | mklog - to generate a template ChangeLog for that commit. contrib/ChangeLog: 2016-03-06 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> * mklog: Look for the ChangeLog file in $cwd. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234014 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog4
-rwxr-xr-xcontrib/mklog2
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index d789cd8cf7b..e40db53ed64 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-06 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
+ * mklog: Look for the ChangeLog file in $cwd.
+
2016-02-26 Joel Sherrill <joel@rtems.org>
* config-list.mk: Add aarch64-rtems and x86_64-rtems
diff --git a/contrib/mklog b/contrib/mklog
index 455614bfb42..61126280f1f 100755
--- a/contrib/mklog
+++ b/contrib/mklog
@@ -104,7 +104,7 @@ sub get_clname ($) {
my $dirname = $_[0];
while ($dirname) {
my $clname = "$dirname/ChangeLog";
- if (-f "$gcc_root/$clname") {
+ if (-f "$gcc_root/$clname" || -f "$clname") {
my $relname = substr ($_[0], length ($dirname) + 1);
return ($clname, $relname);
} else {