urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle git-notes breakage 

The new git-notes feature in git 1.6.6 changes git log output in a way that
broke ikiwiki's parser if notes are added to commits.

I decided to deal with this by disabling notes when ikiwiki uses git,
by setting GIT_NOTES_REF="". AFAICS, looking up notes when dumping logs
will only waste time, since it does not currently seem to make sense for
ikiwiki to do anything with the notes.
master
Joey Hess 2010-01-19 23:42:04 -05:00
parent 30c5f62f74
commit 8bf2f5a31a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/Plugin/git.pm
View File

@ -51,6 +51,9 @@ sub checkconfig () {
wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"), wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
}; };
} }
# Avoid notes, parser does not handle and they only slow things down.
$ENV{GIT_NOTES_REF}="";
# Run receive test only if being called by the wrapper, and not # Run receive test only if being called by the wrapper, and not
# when generating same. # when generating same.

3
debian/changelog vendored
View File

@ -10,6 +10,9 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
* websetup: Fix bug in array change detection. * websetup: Fix bug in array change detection.
* linkmap: Simplify and improve browser compatability by using an img, * linkmap: Simplify and improve browser compatability by using an img,
not object tag. not object tag.
* git: The new git-notes feature in git 1.6.6 changes git log output
in a way that broke ikiwiki's parser if notes are added to commits.
Deal with this.
-- Joey Hess <joeyh@debian.org> Mon, 04 Jan 2010 12:53:24 -0500 -- Joey Hess <joeyh@debian.org> Mon, 04 Jan 2010 12:53:24 -0500