From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 23:17:18 +0000 (-0400)
Subject: Merge branch 'themes'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/184f68efa88d6b8b4763ca18619b25e7d8ae1668?hp=bc32754f1f1ca334078f788a346c27839e245cab

Merge branch 'themes'
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index bb3f89a82..222692eda 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -294,7 +294,7 @@ sub decode_git_file ($) {
 
 	# strip prefix if in a subdir
 	if (! defined $prefix) {
-		$prefix = run_or_die('git', 'rev-parse', '--show-prefix');
+		($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
 		if (! defined $prefix) {
 			$prefix="";
 		}