summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/automerge7.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh
index 7b8c37a5aa..935604fb5d 100755
--- a/scripts/automerge7.sh
+++ b/scripts/automerge7.sh
@@ -1,8 +1,10 @@
#!/bin/bash
+IGNORE=7.0
FROM=7.1
TO=master
+IGNORE_HEAD=origin/$IGNORE
FROM_HEAD=origin/$FROM
PUSH="origin HEAD:refs/for/$TO"
@@ -86,7 +88,7 @@ fi
git checkout $TO
git fetch
-pending=`git log $TO..$FROM_HEAD --reverse|grep "^commit "|sed "s/commit //"`
+pending=`git log $TO..$FROM_HEAD ^$IGNORE_HEAD --reverse|grep "^commit "|sed "s/commit //"`
pendingCommit=
pendingCommitMessage=