From: Simon McVittie <smcv@debian.org>
Date: Mon, 9 Jan 2017 10:53:16 +0000 (+0000)
Subject: Revert "git: Turn $git_dir into a stack"
X-Git-Tag: debian/3.20141016.4~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5ff7b0ab93eb2fe200f1b1acf8279e9d1552b874

Revert "git: Turn $git_dir into a stack"

Now that we have avoided using in_git_dir recursively, we don't need
the stack any more.

This reverts commit 39b8931ad31fe6b48afdc570caa459a0996c2092.

(cherry picked from commit c29c230c33fa4c4994d979fa4d6fcdf280ee8dc6)
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 46751ea28..e94e6376a 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -154,13 +154,13 @@ sub genwrapper {
 	}
 }
 
-my @git_dir_stack;
-my $prefix;
+my $git_dir=undef;
+my $prefix=undef;
 
 sub in_git_dir ($$) {
-	unshift @git_dir_stack, shift;
+	$git_dir=shift;
 	my @ret=shift->();
-	shift @git_dir_stack;
+	$git_dir=undef;
 	$prefix=undef;
 	return @ret;
 }
@@ -217,13 +217,13 @@ sub safe_git {
 			chdir $params{chdir}
 			    or error("cannot chdir to $params{chdir}: $!");
 		}
-		elsif (! @git_dir_stack) {
+		elsif (! defined $git_dir) {
 			chdir $config{srcdir}
 			    or error("cannot chdir to $config{srcdir}: $!");
 		}
 		else {
-			chdir $git_dir_stack[0]
-			    or error("cannot chdir to $git_dir_stack[0]: $!");
+			chdir $git_dir
+			    or error("cannot chdir to $git_dir: $!");
 		}
 
 		if ($params{stdout}) {