summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-06-07 14:03:50 +0300
committerLeif Åstrand <leif@vaadin.com>2013-06-07 14:03:50 +0300
commitfe8d330c3c9f2ae2c0ace28fa5c34e5b2b131112 (patch)
treeb73efd4dcb1a67d2d9e6c2573d21f738339daac6 /scripts
parent8d1ccd76bef6ead837ddb93de307ceee97d6b97b (diff)
downloadvaadin-framework-fe8d330c3c9f2ae2c0ace28fa5c34e5b2b131112.tar.gz
vaadin-framework-fe8d330c3c9f2ae2c0ace28fa5c34e5b2b131112.zip
Escape \ in commit messages
Change-Id: I1c5773dd593d7877833a5b1798f3e812b53a1b1e
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/automerge7.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh
index 935604fb5d..2b98530902 100755
--- a/scripts/automerge7.sh
+++ b/scripts/automerge7.sh
@@ -96,7 +96,7 @@ for commit in $pending
do
echo "Checking $commit..."
mergeDirective=`git log -n 1 --format=%B $commit|grep "^Merge:"|sed "s/Merge: //"`
- commitMsg=`git log -n 1 --format=oneline --abbrev-commit $commit`
+ commitMsg=`git log -n 1 --format=oneline --abbrev-commit $commit | sed 's/\\\\/\\\\\\\\/g'` #Multiple levels of unescaping, sed just changes \ to \\
if [ "$mergeDirective" == "" ]
then
if can_merge $commit