Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'

diff --combined IkiWiki/Plugin/git.pm
index 9e67a36ee79465303b7983b9a4e44b6f7388b704,96a9727e934812d59117ed57ea6094048399052a..4b0e5a86d065fba816d58564dd0593209c9d3680
--- 1/IkiWiki/Plugin/git.pm
--- 2/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@@ -609,7 -609,7 +609,7 @@@ sub rcs_commit_helper (@) 
        # So we should ignore its exit status (hence run_or_non).
        if (run_or_non('git', 'commit', '-m', $params{message}, '-q', @opts)) {
                if (length $config{gitorigin_branch}) {
-                       run_or_cry('git', 'push', $config{gitorigin_branch});
+                       run_or_cry('git', 'push', $config{gitorigin_branch}, $config{gitmaster_branch});
                }
        }
        
@@@ -660,9 -660,7 +660,9 @@@ sub rcs_recentchanges ($) 
                my @pages;
                foreach my $detail (@{ $ci->{'details'} }) {
                        my $file = $detail->{'file'};
 -                      my $efile = uri_escape_utf8($file);
 +                      my $efile = join('/',
 +                              map { uri_escape_utf8($_) } split('/', $file)
 +                      );
  
                        my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
                        $diffurl =~ s/\[\[file\]\]/$efile/go;