aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/git.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-06-23 16:05:49 -0400
committerJoey Hess <joey@kitenet.net>2010-06-23 16:05:49 -0400
commitb4a43406f61b7ff9ab77d242edf4d59369ac8596 (patch)
treeca0d33b7d0e22a19f9fb1610df1f7238bcd2ec3d /IkiWiki/Plugin/git.pm
parentc46bcb425af0948ac59581d6ba7b477826d83ae3 (diff)
downloadikiwiki-b4a43406f61b7ff9ab77d242edf4d59369ac8596.tar
ikiwiki-b4a43406f61b7ff9ab77d242edf4d59369ac8596.tar.gz
API: rcs_commit and rcs_commit_staged are passed a new parameter
that may contain the username component of the email address of the user making the commit.
Diffstat (limited to 'IkiWiki/Plugin/git.pm')
-rw-r--r--IkiWiki/Plugin/git.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index a43b85920..b56f229d7 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -464,12 +464,12 @@ sub rcs_prepedit ($) {
return git_sha1($file);
}
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
# Try to commit the page; returns undef on _success_ and
# a version of the page with the rcs's conflict markers on
# failure.
- my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+ my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
# Check to see if the page has been changed by someone else since
# rcs_prepedit was called.
@@ -485,10 +485,10 @@ sub rcs_commit ($$$;$$) {
return rcs_commit_staged($message, $user, $ipaddr);
}
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
# Commits all staged changes. Changes can be staged using rcs_add,
# rcs_remove, and rcs_rename.
- my ($message, $user, $ipaddr)=@_;
+ my ($message, $user, $ipaddr, $emailuser)=@_;
# Set the commit author and email to the web committer.
my %env=%ENV;