From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Feb 2014 18:19:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'
X-Git-Tag: debian/3.20140227~20
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c1fbd66c031980f89e6b28862fe90813b1074c2e?hp=-c

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

c1fbd66c031980f89e6b28862fe90813b1074c2e
diff --combined IkiWiki/Plugin/git.pm
index 9e67a36ee,96a9727e9..4b0e5a86d
--- a/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;