From: Eric S. Raymond Date: Thu, 21 Nov 2013 06:54:48 +0000 (-0500) Subject: Merge commit 'refs/merge-requests/26' of git://gitorious.org/irker/irker into merge... X-Git-Tag: 2.1~10 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5453aec4194a835f83840b8c652ef74802bf40ca;hp=08a99d601bf7ba62b02ec3189cc8fade646ff230;p=irker.git Merge commit 'refs/merge-requests/26' of git://gitorious.org/irker/irker into merge-requests/26 --- diff --git a/irkerhook.py b/irkerhook.py index 8087935..20ef911 100755 --- a/irkerhook.py +++ b/irkerhook.py @@ -271,12 +271,11 @@ class GitExtractor(GenericExtractor): # Extract the meta-information for the commit commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit)) commit.files = " ".join(commit.files.strip().split("\n")[1:]) - # Design choice: for git we ship only the first line, which is + # Design choice: for git we ship only the first message line, which is # conventionally supposed to be a summary of the commit. Under # other VCSes a different choice may be appropriate. - commit.author_name = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit)) - commit.mail = do("git log -1 '--pretty=format:%ae' " + shellquote(commit.commit)) - commit.logmsg = do("git log -1 '--pretty=format:%s' " + shellquote(commit.commit)) + commit.author_name, commit.mail, commit.logmsg = \ + do("git log -1 '--pretty=format:%an%n%ae%n%s' " + shellquote(commit.commit)).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