cherry-pick uri security fix

[git.ikiwiki.info.git] / IkiWiki / Rcs / git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 98c9a5eae8f5a6783bb1f3e289e4230ac707b03d..26a6f42661a652249c8a4c7475dfb45578b8fc03 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -247,8 +247,6 @@ sub _parse_diff_tree ($@) { #{{{
                last;
        }
 
                last;
        }
 

-       debug("No detail in diff-tree output") if !defined $ci{'details'};
-

        return \%ci;
 } #}}}
 
        return \%ci;
 } #}}}
 


@@ -374,7 +372,7 @@ sub rcs_recentchanges ($) { #{{{
 
                my ($sha1, $when) = (
                        $ci->{'sha1'},
 
                my ($sha1, $when) = (
                        $ci->{'sha1'},

-                       time - $ci->{'author_epoch'}
+                       $ci->{'author_epoch'}

                );
 
                my (@pages, @messages);
                );
 
                my (@pages, @messages);


@@ -421,47 +419,6 @@ sub rcs_recentchanges ($) { #{{{
        return @rets;
 } #}}}
 
        return @rets;
 } #}}}
 

-sub rcs_notify () { #{{{
-       # Send notification mail to subscribed users.
-       #
-       # In usual Git usage, hooks/update script is presumed to send
-       # notification mails (see git-receive-pack(1)).  But we prefer
-       # hooks/post-update to support IkiWiki commits coming from a
-       # cloned repository (through command line) because post-update
-       # is called _after_ each ref in repository is updated (update
-       # hook is called _before_ the repository is updated).
-       #
-       # Here, we rely on a simple fact: we can extract all parts of the
-       # notification content by parsing the "HEAD" commit.
-
-       my $ci = git_commit_info('HEAD');
-       return if !defined $ci;
-
-       my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
-
-       my ($user, $message);
-       if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
-               $user    = defined $2 ? "$2" : "$3";
-               $message = $4;
-       }
-       else {
-               $user    = $ci->{'author_username'};
-               $message = join "\n", @{ $ci->{'comment'} };
-       }
-
-       my $sha1 = $ci->{'sha1'};
-
-       require IkiWiki::UserInfo;
-       send_commit_mails(
-               sub {
-                       $message;
-               },
-               sub {
-                       join "\n", run_or_die('git', 'diff', "${sha1}^", $sha1);
-               }, $user, @changed_pages
-       );
-} #}}}
-

 sub rcs_getctime ($) { #{{{
        my $file=shift;
        # Remove srcdir prefix
 sub rcs_getctime ($) { #{{{
        my $file=shift;
        # Remove srcdir prefix