X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ddc9441beb0c85e1f7578f4e31c9bf5497955e5e..8550c397016bd66095f24de64b077526e08bbab2:/IkiWiki/Plugin/git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 4b0e5a86d..12e79f3dd 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -220,6 +220,18 @@ 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, @_) }
 
+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 $email) {
+		run_or_die("git", "config", "user.email", "ikiwiki.info");
+	}
+}
 
 sub merge_past ($$$) {
 	# Unlike with Subversion, Git cannot make a 'svn merge -rN:M file'.
@@ -258,6 +270,8 @@ sub merge_past ($$$) {
 	my @undo;      # undo stack for cleanup in case of an error
 	my $conflict;  # file content with conflict markers
 
+	ensure_committer();
+
 	eval {
 		# Hide local changes from Git by renaming the modified file.
 		# Relative paths must be converted to absolute for renaming.
@@ -467,6 +481,11 @@ sub git_commit_info ($;$) {
 sub rcs_find_changes ($) {
 	my $oldrev=shift;
 
+	# Note that git log will sometimes show files being added that
+	# don't exist. Particularly, git merge -s ours can result in a
+	# merge commit where some files were not really added.
+	# This is why the code below verifies that the files really
+	# exist.
 	my @raw_lines = run_or_die('git', 'log',
 		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
 		'--no-renames', , '--reverse',
@@ -482,12 +501,16 @@ sub rcs_find_changes ($) {
 		foreach my $i (@{$ci->{details}}) {
 			my $file=$i->{file};
 			if ($i->{sha1_to} eq $nullsha) {
-				delete $changed{$file};
-				$deleted{$file}=1;
+				if (! -e "$config{srcdir}/$file") {
+					delete $changed{$file};
+					$deleted{$file}=1;
+				}
 			}
 			else {
-				delete $deleted{$file};
-				$changed{$file}=1;
+				if (-e "$config{srcdir}/$file") {
+					delete $deleted{$file};
+					$changed{$file}=1;
+				}
 			}
 		}
 	}
@@ -517,6 +540,8 @@ sub rcs_get_current_rev () {
 sub rcs_update () {
 	# Update working directory.
 
+	ensure_committer();
+
 	if (length $config{gitorigin_branch}) {
 		run_or_cry('git', 'pull', '--prune', $config{gitorigin_branch});
 	}
@@ -560,6 +585,8 @@ 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;
@@ -570,7 +597,7 @@ sub rcs_commit_helper (@) {
 			$u=$params{session}->remote_addr();
 		}
 		if (defined $u) {
-			$u=encode_utf8($u);
+			$u=encode_utf8(IkiWiki::cloak($u));
 			$ENV{GIT_AUTHOR_NAME}=$u;
 		}
 		if (defined $params{session}->param("nickname")) {
@@ -622,6 +649,8 @@ sub rcs_add ($) {
 
 	my ($file) = @_;
 
+	ensure_committer();
+
 	run_or_cry('git', 'add', $file);
 }
 
@@ -630,12 +659,16 @@ sub rcs_remove ($) {
 
 	my ($file) = @_;
 
+	ensure_committer();
+
 	run_or_cry('git', 'rm', '-f', $file);
 }
 
 sub rcs_rename ($$) {
 	my ($src, $dest) = @_;
 
+	ensure_committer();
+
 	run_or_cry('git', 'mv', '-f', $src, $dest);
 }
 
@@ -935,6 +968,8 @@ sub rcs_revert ($) {
 	my $rev = shift;
 	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
 
+	ensure_committer();
+
 	if (run_or_non('git', 'revert', '--no-commit', $sha1)) {
 		return undef;
 	}