From 7d0ef85d802a99c968965b4f7d4e5947b130d2b8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 29 Dec 2010 20:19:58 -0400
Subject: git: Fix bug involving attempting to web revert a commit that
 included changes to attachments.

---
 IkiWiki/Plugin/git.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index cadc69e24..cf7fbe9b7 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -860,9 +860,8 @@ sub rcs_preprevert ($) {
 	# in order to see all changes.
 	my ($subdir, $rootdir) = git_find_root();
 	$git_dir=$rootdir;
-	my @commits=git_commit_info($sha1, 1);
-	$git_dir=undef;
 
+	my @commits=git_commit_info($sha1, 1);
 	if (! @commits) {
 		error "unknown commit"; # just in case
 	}
@@ -873,7 +872,10 @@ sub rcs_preprevert ($) {
 		error gettext("you are not allowed to revert a merge");
 	}
 
-	return git_parse_changes(@commits);
+	my @ret=git_parse_changes(@commits);
+
+	$git_dir=undef;
+	return @ret;
 }
 
 sub rcs_revert ($) {
-- 
cgit v1.2.3