aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-04-06 16:43:02 -0700
committerIan Lance Taylor <iant@golang.org>2020-04-06 16:43:02 -0700
commit42fd3e04ccbfbc47c1fddb15d384814637df0636 (patch)
treee2695726e95b7bd125d52b7bdd315cb0028854fa /contrib
parent00eb71c43c74cc5143b60d470450c3981037ed3c (diff)
parent52fa80f853c0b0f623ea9e4c7198e324ce44ff30 (diff)
downloadgcc-42fd3e04ccbfbc47c1fddb15d384814637df0636.zip
gcc-42fd3e04ccbfbc47c1fddb15d384814637df0636.tar.gz
gcc-42fd3e04ccbfbc47c1fddb15d384814637df0636.tar.bz2
Merge from trunk revision 52fa80f853c0b0f623ea9e4c7198e324ce44ff30
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog5
-rwxr-xr-xcontrib/gcc-git-customization.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 488a32c..ab9254b 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-03 Martin Liska <mliska@suse.cz>
+
+ * gcc-git-customization.sh: Search for the pattern
+ at line beginning only.
+
2020-01-24 Richard Earnshaw <rearnsha@arm.com>
* gcc-git-customization.sh: Use users/<pfx> for the personal remote
diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh
index f3e4831..a932bf8 100755
--- a/contrib/gcc-git-customization.sh
+++ b/contrib/gcc-git-customization.sh
@@ -18,7 +18,7 @@ ask () {
}
# Add a git command to find the git commit equivalent to legacy SVN revision NNN
-git config alias.svn-rev '!f() { rev=$1; shift; git log --all --grep="From-SVN: r\\?$rev\\b" "${@}"; } ; f'
+git config alias.svn-rev '!f() { rev=$1; shift; git log --all --grep="^From-SVN: r\\?$rev\\b" "${@}"; } ; f'
# Add git commands to convert git commit to monotonically increasing revision number
# and vice versa