X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8550c397016bd66095f24de64b077526e08bbab2..c7bdebaaf134729356852918b387071c92f85e72:/IkiWiki/Plugin/git.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 12e79f3dd..bfca933fd 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -221,15 +221,18 @@ sub run_or_cry ($@) { safe_git(sub { warn @_ }, undef, @_) }
 sub run_or_non ($@) { safe_git(undef, undef, @_) }
 
 sub ensure_committer {
-	my $name = join('', run_or_non("git", "config", "user.name"));
-	my $email = join('', run_or_non("git", "config", "user.email"));
-
-	if (! length $name) {
-		run_or_die("git", "config", "user.name", "IkiWiki");
+	if (! length $ENV{GIT_AUTHOR_NAME} || ! length $ENV{GIT_COMMITTER_NAME}) {
+		my $name = join('', run_or_non("git", "config", "user.name"));
+		if (! length $name) {
+			run_or_die("git", "config", "user.name", "IkiWiki");
+		}
 	}
 
-	if (! length $email) {
-		run_or_die("git", "config", "user.email", "ikiwiki.info");
+	if (! length $ENV{GIT_AUTHOR_EMAIL} || ! length $ENV{GIT_COMMITTER_EMAIL}) {
+		my $email = join('', run_or_non("git", "config", "user.email"));
+		if (! length $email) {
+			run_or_die("git", "config", "user.email", "ikiwiki.info");
+		}
 	}
 }
 
@@ -585,8 +588,6 @@ sub rcs_commit_helper (@) {
 	
 	my %env=%ENV;
 
-	ensure_committer();
-
 	if (defined $params{session}) {
 		# Set the commit author and email based on web session info.
 		my $u;
@@ -610,6 +611,8 @@ sub rcs_commit_helper (@) {
 		}
 	}
 
+	ensure_committer();
+
 	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
 	my @opts;
 	if ($params{message} !~ /\S/) {
@@ -651,7 +654,7 @@ sub rcs_add ($) {
 
 	ensure_committer();
 
-	run_or_cry('git', 'add', $file);
+	run_or_cry('git', 'add', '--', $file);
 }
 
 sub rcs_remove ($) {
@@ -661,7 +664,7 @@ sub rcs_remove ($) {
 
 	ensure_committer();
 
-	run_or_cry('git', 'rm', '-f', $file);
+	run_or_cry('git', 'rm', '-f', '--', $file);
 }
 
 sub rcs_rename ($$) {
@@ -669,7 +672,7 @@ sub rcs_rename ($$) {
 
 	ensure_committer();
 
-	run_or_cry('git', 'mv', '-f', $src, $dest);
+	run_or_cry('git', 'mv', '-f', '--', $src, $dest);
 }
 
 sub rcs_recentchanges ($) {