rename: Fix to pass named parameters to rcs_commit
parent
b342d09606
commit
a5120846cb
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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]]
|
||||
|
|
|
@ -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]]
|
||||
|
|
Loading…
Reference in New Issue