X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0de3074c7f0dbe780919a53a057ee53b31d5e233..b6774bc6afac48e2c0a122647edc1485e7174a6e:/IkiWiki/Plugin/git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 0da4e0dbc..7a6a55495 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -221,6 +221,11 @@ sub safe_git {
 			chdir $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}}': $!");
 	}
 	# In parent.
@@ -958,11 +963,11 @@ sub git_parse_changes {
 				die $@ if $@;
 				my $fh;
 				($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1);
-				my $cmd = "cd $git_dir_stack[0] && ".
-				          "git show $detail->{sha1_to} > '$path'";
-				if (system($cmd) != 0) {
-					error("failed writing temp file '$path'.");
-				}
+				safe_git(
+					error_handler => sub { error("failed writing temp file '$path': ".shift."."); },
+					stdout => $fh,
+					cmdline => ['git', 'show', $detail->{sha1_to}],
+				);
 			}
 
 			push @rets, {
@@ -1033,10 +1038,6 @@ sub rcs_preprevert ($) {
 		my $failure;
 		my @ret;
 		eval {
-			IkiWiki::disable_commit_hook();
-			push @undo, sub {
-				IkiWiki::enable_commit_hook();
-			};
 			my $branch = "ikiwiki_revert_${sha1}"; # supposed to be unique
 
 			push @undo, sub {
@@ -1094,7 +1095,7 @@ sub rcs_revert ($) {
 
 	ensure_committer();
 
-	if (run_or_non('git', 'merge', '--ff-only', "ikiwiki_revert_$sha1")) {
+	if (run_or_non('git', 'cherry-pick', '--no-commit', "ikiwiki_revert_$sha1")) {
 		return undef;
 	}
 	else {