Author name truncation is git-specific.

diff --git a/git-irkbot.py b/git-irkbot.py
index feac6b064bde2ec126f59d4f5ae5d41d29009184..65b03e8e877dfb7093409623a56fcb99f6278ab7 100755 (executable)
--- a/git-irkbot.py
+++ b/git-irkbot.py
@@ -127,6 +127,11 @@ class GitExtractor:
         self.files = do("git diff-tree -r --name-only '"+ merged +"' | sed -e '1d' -e 's-.*-&-'")
         metainfo = do("git log -1 '--pretty=format:%an <%ae>%n%s' " + merged)
         (self.author, self.logmsg) = metainfo.split("\n")
+        # This discards the part of the author's address after @.
+        # Might be be nice to ship the full email address, if not
+        # for spammers' address harvesters - getting this wrong
+        # would make the freenode #commits channel into harvester heaven.
+        self.author = self.author.replace("<", "").split("@")[0].split()[-1]
 
 if __name__ == "__main__":
     import getopt
@@ -169,11 +174,6 @@ if __name__ == "__main__":
 
     for merged in merges:
         extractor.extract(refname, merged)
-        # This discards the part of the author's address after @.
-        # Might be be nice to ship the full email address, if not
-        # for spammers' address harvesters - getting this wrong
-        # would make the freenode #commits channel into harvester heaven.
-        extractor.author = extractor.author.replace("<", "").split("@")[0].split()[-1]
         privmsg = template % extractor.__dict__
         channel_list = extractor.channels.split(",")
         structure = {"to":channel_list, "privmsg":privmsg}