summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-08-24 22:14:49 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2012-08-24 22:14:49 (GMT)
commit7e41b15462b7c9ba3d18b586083c87617025e6f4 (patch)
treed42634a6d5d7080b1e68076571cdb30a7c62f13e
parent40e6c26189ff747d5d33935ecbe4b52abddda239 (diff)
downloadtip-bot-7e41b15462b7c9ba3d18b586083c87617025e6f4.zip
tip-bot-7e41b15462b7c9ba3d18b586083c87617025e6f4.tar.gz
tip-bot-7e41b15462b7c9ba3d18b586083c87617025e6f4.tar.bz2
tip-bot-7e41b15462b7c9ba3d18b586083c87617025e6f4.tar.xz
Only merge things that we can find heads for...
-rwxr-xr-xrobot.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/robot.sh b/robot.sh
index ff909af..a76784e 100755
--- a/robot.sh
+++ b/robot.sh
@@ -48,7 +48,7 @@ max_mails=100
OLD_HEAD=$(git rev-parse HEAD)
git fetch -f
git fetch -f linus
- git merge -s ours -m "Mail run on $date" $(sed -e 's:^:refs/remotes/origin/:' < "$topdir"/branches)
+ git merge -s ours -m "Mail run on $date" $(sed -e 's:^:refs/remotes/origin/:' < "$topdir"/branches.heads)
NEW_HEAD=$(git rev-parse HEAD)
# Filter out the branches that should be considered baselines and *never* receive