urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: write proposed attachment to temp file without going via system()

master
Simon McVittie 2016-12-28 19:35:14 +00:00
parent 7f2235478d
commit 4ad4fc33b5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IkiWiki/Plugin/git.pm
View File

@ -221,6 +221,11 @@ sub safe_git {
chdir $git_dir_stack[0] chdir $git_dir_stack[0]
or error("cannot chdir to $git_dir_stack[0]: $!"); or error("cannot chdir to $git_dir_stack[0]: $!");
} }
if ($params{stdout}) {
open(STDOUT, '>&', $params{stdout}) or error("Cannot reopen stdout: $!");
}
exec @{$params{cmdline}} or error("Cannot exec '@{$params{cmdline}}': $!"); exec @{$params{cmdline}} or error("Cannot exec '@{$params{cmdline}}': $!");
} }
# In parent. # In parent.
@ -958,11 +963,11 @@ sub git_parse_changes {
die $@ if $@; die $@ if $@;
my $fh; my $fh;
($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1); ($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1);
my $cmd = "cd $git_dir_stack[0] && ". safe_git(
"git show $detail->{sha1_to} > '$path'"; error_handler => sub { error("failed writing temp file '$path': ".shift."."); },
if (system($cmd) != 0) { stdout => $fh,
error("failed writing temp file '$path'."); cmdline => ['git', 'show', $detail->{sha1_to}],
} );
} }
push @rets, { push @rets, {