diff options
| author | Joey Hess <joey@kitenet.net> | 2010-11-29 13:28:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-29 13:28:28 -0400 |
| commit | a5120846cb6461616dce4d0042a4fd45211170e4 (patch) | |
| tree | 7cec2ccdbc641aa08ed1c3ca64f059afe4357229 | |
| parent | b342d0960666804b595a105919e1288f6057a686 (diff) | |
rename: Fix to pass named parameters to rcs_commit
| -rw-r--r-- | IkiWiki/Plugin/rename.pm | 9 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn | 7 | ||||
| -rw-r--r-- | doc/bugs/rename_fixup_not_attributed_to_author.mdwn | 3 |
4 files changed, 15 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index ad5e72645..a05e85be0 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -574,11 +574,10 @@ sub fixlinks ($$$) { eval { writefile($file, $config{srcdir}, $content) }; next if $@; my $conflict=IkiWiki::rcs_commit( - $file, - sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}), - $token, - $session->param("name"), - $session->remote_addr(), + file => $file, + message => sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}), + token => $token, + session => $session, ); push @fixedlinks, $page if ! defined $conflict; } diff --git a/debian/changelog b/debian/changelog index 6f97399d8..bab5eeb88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * edittemplate: Fix crash if using a .tmpl file or other non-page file as a template for a new page. * git: Fix temp file location. + * rename: Fix to pass named parameters to rcs_commit. -- Joey Hess <joeyh@debian.org> Tue, 16 Nov 2010 14:23:47 -0400 diff --git a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn index 1b6eeb2a5..829e80327 100644 --- a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn +++ b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn @@ -9,3 +9,10 @@ I'm unsure yet why the recentchanges files were being committed. Possibly because of the link fixup code run when renaming a page. --[[Joey]] > See also [[bugs/rename fixup not attributed to author]]. --[[smcv]] + +> Ok, there was a call to `rcs_commit` that was still using non-named +> parameters, which confused it thuroughly, and I think caused +> 'git add .' to be called. I've fixed that. +> +> I think there is still potential for the problem I described above to +> occur during a rename or possibly otherwise. --[[Joey]] diff --git a/doc/bugs/rename_fixup_not_attributed_to_author.mdwn b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn index 3122307a2..bcfafac22 100644 --- a/doc/bugs/rename_fixup_not_attributed_to_author.mdwn +++ b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn @@ -7,3 +7,6 @@ and didn't set a commit message. been committed, for which see [[bugs/git_commit_adds_files_that_were_not_tracked]].) --[[smcv]] + +> It was calling `rcs_commit` old-style, and so not passing the session +> object that is used to get the user's name. [[fixed|done]] --[[Joey]] |