From 1f347c50efc8c095999022d94ee176b4eb9b4aca Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sun, 6 Mar 2016 17:36:19 +0000 Subject: [PATCH] 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 * mklog: Look for the ChangeLog file in $cwd. From-SVN: r234014 --- contrib/ChangeLog | 4 ++++ contrib/mklog | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * mklog: Look for the ChangeLog file in $cwd. + 2016-02-26 Joel Sherrill * 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 {