summaryrefslogtreecommitdiffstats
path: root/gitmirror
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-07-19 18:05:12 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-07-19 18:05:12 -0700
commit08425cc46a2617f98aefb3e3743a501621f56bbe (patch)
tree0a899a1be55a70af5fb8c95eb634e14055de5e91 /gitmirror
parent974bc06f4d5fca571f4d8bc38cf05814d8f6d65d (diff)
downloadnasmbuild-08425cc46a2617f98aefb3e3743a501621f56bbe.tar.gz
nasmbuild-08425cc46a2617f98aefb3e3743a501621f56bbe.tar.xz
nasmbuild-08425cc46a2617f98aefb3e3743a501621f56bbe.zip
Additional adjustments needed to the tip bot
Diffstat (limited to 'gitmirror')
-rwxr-xr-xgitmirror/filter-branches.pl5
-rwxr-xr-xgitmirror/robot.sh3
-rwxr-xr-xgitmirror/robotfmt.pl5
3 files changed, 6 insertions, 7 deletions
diff --git a/gitmirror/filter-branches.pl b/gitmirror/filter-branches.pl
index 002c923..41140d7 100755
--- a/gitmirror/filter-branches.pl
+++ b/gitmirror/filter-branches.pl
@@ -3,14 +3,15 @@ open(GIT, "-|", "git branch -r") or die;
%branches = ();
while (<GIT>) {
chomp;
- s/^[ \*] //;
+ next if (!m:^[ \*] origin/:);
+ s:^[ \*] origin/::;
next if (/ \-\> /);
next if (/^\s*(\#.*|)$/);
next if (/^build$/);
next if (/^auto-/);
next if (/^tmp-/);
next if (/^[^\/]+\/base-/);
- $branches{"refs/remotes/".$_}++;
+ $branches{$_}++;
}
close(GIT);
foreach $b (sort(keys(%branches))) {
diff --git a/gitmirror/robot.sh b/gitmirror/robot.sh
index 2c23482..b8c4579 100755
--- a/gitmirror/robot.sh
+++ b/gitmirror/robot.sh
@@ -29,7 +29,7 @@ date=$(date -uR)
mkdir -m 0700 -p $tmpdir
- GIT_DIR="$slave" "$topdir"/filter-branches.pl > branches
+ ( cd "$slave" && "$topdir"/filter-branches.pl ) > branches
(
while read branch; do
GIT_DIR="$MASTER" git rev-parse "$branch"'^{}'
@@ -42,7 +42,6 @@ date=$(date -uR)
git checkout mail-merge
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)
NEW_HEAD=$(git rev-parse HEAD)
diff --git a/gitmirror/robotfmt.pl b/gitmirror/robotfmt.pl
index af99572..d7845e0 100755
--- a/gitmirror/robotfmt.pl
+++ b/gitmirror/robotfmt.pl
@@ -55,11 +55,10 @@ sub best_branch($$) {
}
$branch = best_branch($rev, $branches);
-
$format = <<EOF;
From: \"nasm-bot for %an\" <%ae>
-To: nasm-cvs@lists.sourceforge.net
-Subject: [${branch}] %s
+To: NASM commits mailing list <nasm-cvs\@lists.sourceforge.net>
+Subject: [nasm:${branch}] %s
Message-ID: <nasm-%H\@git.nasm.us>
Git-Commit-ID: %H
X-Mailer: NASM-git-log-daemon