diff options
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 4 | ||||
| -rw-r--r-- | debian/NEWS | 15 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 6a7f6c3ae..3085a3b67 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -94,8 +94,8 @@ sub getsetup () { }, diffurl => { type => "string", - example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]", - description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], [[sha1_commit]] and [[file]] substituted)", + example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]", + description => "gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)", safe => 1, rebuild => 1, }, diff --git a/debian/NEWS b/debian/NEWS index 6fe70c9e4..22513cc4a 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,18 @@ +ikiwiki (3.01) unstable; urgency=low + + If your wiki uses git, and you have a `diffurl` configured in + its setup file, you should be aware that gitweb has stopped + supporting the url form commonly used for the `diffurl`. + + You can change your setup to use the newer gitweb url form: + + http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]] + + The changes from the old form are the addition of the `hpb` parameter, + and the change to the value used for the `hb` parameter. + + -- Joey Hess <joeyh@debian.org> Mon, 05 Jan 2009 18:18:05 -0500 + ikiwiki (3.00) unstable; urgency=low The 3.0 release of ikiwiki changes several defaults and finishes diff --git a/debian/changelog b/debian/changelog index f892dc524..afaccc2d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (3.01) UNRELEASED; urgency=low * Fix documentation about git hook to use right name. Closes: #510393 * yesno: Always accept English even when localised. * yesno: Also accept 1 and 0 as input. + * A recent change to gitweb removed support for the form of diffurl + that many ikiwiki setups use. Document how to use the new url form. -- Joey Hess <joeyh@debian.org> Fri, 02 Jan 2009 14:12:16 -0500 |