summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-08-27 16:50:28 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2012-08-27 16:50:28 (GMT)
commitd8a7404e0bf6653231db80bec7ffaa517fdb33b0 (patch)
tree8e73ff5dac3cd43b7c78d5cd2574baa6e16b5b59
parent7e41b15462b7c9ba3d18b586083c87617025e6f4 (diff)
downloadtip-bot-d8a7404e0bf6653231db80bec7ffaa517fdb33b0.zip
tip-bot-d8a7404e0bf6653231db80bec7ffaa517fdb33b0.tar.gz
tip-bot-d8a7404e0bf6653231db80bec7ffaa517fdb33b0.tar.bz2
tip-bot-d8a7404e0bf6653231db80bec7ffaa517fdb33b0.tar.xz
Don't put refs/heads/... in front of a hex commit ID
-rwxr-xr-xrobot.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/robot.sh b/robot.sh
index a76784e..d9d43b4 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.heads)
+ git merge -s ours -m "Mail run on $date" $(cat "$topdir"/branches.heads)
NEW_HEAD=$(git rev-parse HEAD)
# Filter out the branches that should be considered baselines and *never* receive