From be06bfe1be81bbb8332484c59613b80552e2bfcf Mon Sep 17 00:00:00 2001
From: "jperkin/jonathan@chorlton.adsl.perkin.org.uk" <>
Date: Tue, 4 Dec 2007 12:57:16 +0000
Subject: [PATCH 1/2] post-commit:   Use $BK_USER, if set, in preference to
 $USER

---
 BitKeeper/triggers/post-commit | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 865d7cdac92..58e8a3996cb 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -1,7 +1,14 @@
 #!/bin/sh
 
 #shift
-FROM=$USER@mysql.com
+if [ -n "$BK_USER" ]
+then
+  COMMITTER=$BK_USER
+  FROM=$BK_USER@mysql.com
+else
+  COMMITTER=$USER
+  FROM=$USER@mysql.com
+fi
 COMMITS=commits@lists.mysql.com
 DOCS=docs-commit@mysql.com
 LIMIT=10000
@@ -88,8 +95,8 @@ Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 X-CSetKey: <$CSETKEY>
 $BH
 Below is the list of changes that have just been committed into a local
-$VERSION repository of $USER. When $USER does a push these changes will
-be propagated to the main repository and, within 24 hours after the
+$VERSION repository of $COMMITTER.  When $COMMITTER does a push these changes
+will be propagated to the main repository and, within 24 hours after the
 push, to the public repository.
 For information on how to access the public repository
 see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

From 89153ffa1b0b501b83d5f617824a1a294ea5b428 Mon Sep 17 00:00:00 2001
From: "jperkin/jonathan@chorlton.adsl.perkin.org.uk" <>
Date: Fri, 14 Dec 2007 15:43:54 +0000
Subject: [PATCH 2/2] post-commit:   Rationalise setting $FROM.

---
 BitKeeper/triggers/post-commit | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 58e8a3996cb..a3e329079c8 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -4,11 +4,10 @@
 if [ -n "$BK_USER" ]
 then
   COMMITTER=$BK_USER
-  FROM=$BK_USER@mysql.com
 else
   COMMITTER=$USER
-  FROM=$USER@mysql.com
 fi
+FROM=$COMMITTER@mysql.com
 COMMITS=commits@lists.mysql.com
 DOCS=docs-commit@mysql.com
 LIMIT=10000