diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-23 18:05:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-23 18:05:57 -0400 |
| commit | 85f4b99710fa94b9b67cee061c37eaf49be36b25 (patch) | |
| tree | 0c3f8d4857b4fc93f52e63f3d4e9154a3e129d07 /IkiWiki | |
| parent | f349e4ef36d0653c779872d9eb8dca94e6c15d90 (diff) | |
| download | ikiwiki-85f4b99710fa94b9b67cee061c37eaf49be36b25.tar ikiwiki-85f4b99710fa94b9b67cee061c37eaf49be36b25.tar.gz | |
untrusted committers code seems to be fully working
Still need to investigate possible races, and test some more.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index bdac6f7a1..e565f6369 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -365,8 +365,10 @@ sub git_commit_info ($;$) { #{{{ # starting from the given sha1sum. my ($sha1, $num) = @_; - my @raw_lines = run_or_die('git', 'log', - (defined $num ? "--max-count=$num" : ""), + my @opts; + push @opts, "--max-count=$num" if defined $num; + + my @raw_lines = run_or_die('git', 'log', @opts, '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c', '-r', $sha1, '--', '.'); my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix'); @@ -645,7 +647,7 @@ sub rcs_receive () { #{{{ eval q{use File::Temp}; die $@ if $@; my $fh; - ($fh, $path)=tempfile("XXXXXXXXXX", UNLINK => 1); + ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) { error("failed writing temp file"); } @@ -678,7 +680,7 @@ sub rcs_receive () { #{{{ } } - return @rets; + return reverse @rets; } #}}} 1 |