summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-12-28 00:27:02 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2010-12-28 00:27:02 (GMT)
commitb4b5f16a603205d1f11c20a17cdfa067523db386 (patch)
tree1d3d851e54c183c65a0cba6bfc6a794f5073795c
parent7e7ef1594152c5507c7ac52ba8c712c01e943d0b (diff)
downloadtip-bot-b4b5f16a603205d1f11c20a17cdfa067523db386.zip
tip-bot-b4b5f16a603205d1f11c20a17cdfa067523db386.tar.gz
tip-bot-b4b5f16a603205d1f11c20a17cdfa067523db386.tar.bz2
tip-bot-b4b5f16a603205d1f11c20a17cdfa067523db386.tar.xz
Exclude tree/* as being baselines and therefore should never be announced.
-rwxr-xr-xrobot.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/robot.sh b/robot.sh
index ba055b4..899d9e0 100755
--- a/robot.sh
+++ b/robot.sh
@@ -45,8 +45,12 @@ date=$(date -uR)
git merge -s ours -m "Mail run on $date" $(sed -e 's:^:refs/remotes/origin/:' < "$topdir"/branches)
NEW_HEAD=$(git rev-parse HEAD)
+ # Filter out the branches that should be considered baselines and *never* receive
+ # announcements. This may eventually turn into a separate script.
+ baselines=$(sed -e 's:^tree/:^refs/remotes/origin/\1:' < "$topdir"/branches)
+
if [ x"$NEW_HEAD" != x"$OLD_HEAD" ]; then
- git rev-list --reverse --no-merges ^linus/master ^$OLD_HEAD $NEW_HEAD > "$tmpdir"/revlist.$$
+ git rev-list --reverse --no-merges ^linus/master $baselines ^$OLD_HEAD $NEW_HEAD > "$tmpdir"/revlist.$$
count=$(wc -l < "$tmpdir"/revlist.$$)
if [ $count -gt 100 ]; then
# Failsafe!