Browse Source

Escape \ in commit messages

Change-Id: I1c5773dd593d7877833a5b1798f3e812b53a1b1e
tags/7.2.0.beta1
Leif Åstrand 11 years ago
parent
commit
fe8d330c3c
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      scripts/automerge7.sh

+ 1
- 1
scripts/automerge7.sh View File

@@ -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

Loading…
Cancel
Save