From: Simon McVittie <smcv@debian.org>
Date: Mon, 30 Nov 2015 20:45:38 +0000 (+0000)
Subject: Don't memoize ensure_committer
X-Git-Tag: debian/3.20120629.2+deb7u2~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f62b4f45039a1acb5f9173b0835475d28c1058a5

Don't memoize ensure_committer

This makes it harder to test, and if we're invoking git anyway,
a couple of extra subprocesses are no big deal.

(cherry picked from commit 8550c397016bd66095f24de64b077526e08bbab2)
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 8bf7ff690..9cebabea4 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -220,10 +220,7 @@ sub run_or_die ($@) { safe_git(\&error, undef, @_) }
 sub run_or_cry ($@) { safe_git(sub { warn @_ }, undef, @_) }
 sub run_or_non ($@) { safe_git(undef, undef, @_) }
 
-my $ensured_committer;
 sub ensure_committer {
-	return if $ensured_committer;
-
 	my $name = join('', run_or_non("git", "config", "user.name"));
 	my $email = join('', run_or_non("git", "config", "user.email"));
 
@@ -234,8 +231,6 @@ sub ensure_committer {
 	if (! length $email) {
 		run_or_die("git", "config", "user.email", "ikiwiki.info");
 	}
-
-	$ensured_committer = 1;
 }
 
 sub merge_past ($$$) {