From afd3126e555b01ea9e3b5d9f3b7625b2fdca1d12 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Jul 2008 19:12:34 -0400 Subject: dummy up an email address for web commits Not doing so breaks cia and other things that try to parse a username out of the email address. --- IkiWiki/Rcs/git.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'IkiWiki/Rcs') diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 26f2a39f2..aa7657b5c 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -319,11 +319,12 @@ sub rcs_commit ($$$;$$) { #{{{ return $conflict if defined $conflict; } - # Set the commit author to the web committer. + # Set the commit author and email to the web committer. my %env=%ENV; if (defined $user || defined $ipaddr) { - $ENV{GIT_AUTHOR_NAME}=(defined $user ? $user : $ipaddr)." (web)"; - $ENV{GIT_AUTHOR_EMAIL}=""; + my $u=defined $user ? $user : $ipaddr; + $ENV{GIT_AUTHOR_NAME}=$u; + $ENV{GIT_AUTHOR_EMAIL}="$u\@web"; } # git commit returns non-zero if file has not been really changed. @@ -390,7 +391,7 @@ sub rcs_recentchanges ($) { #{{{ } my $user=$ci->{'author_username'}; - my $web_commit = ($user=~s/\s+\(web\)$//); + my $web_commit = ($user=~s/\@web//); # compatability code for old web commit messages if (! $web_commit && -- cgit v1.2.3