From: Joey Hess Date: Wed, 20 Jan 2010 04:42:04 +0000 (-0500) Subject: handle git-notes breakage X-Git-Tag: 3.20100122~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8bf2f5a31ae3569b0c1c5b139640f7e8356a90f4;p=ikiwiki.git 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. --- diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 786c7b1f2..1eec6aee6 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -51,6 +51,9 @@ sub checkconfig () { 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 # when generating same. diff --git a/debian/changelog b/debian/changelog index f17eed3e5..6fbbe0a23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * websetup: Fix bug in array change detection. * linkmap: Simplify and improve browser compatability by using an img, 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 Mon, 04 Jan 2010 12:53:24 -0500