user/sven/git.git/gitweb, branch v1.6.5.2

Merge branch 'mr/gitweb-snapshot'

2009-09-01T05:09:53Z

* mr/gitweb-snapshot: gitweb: add t9501 tests for checking HTTP status codes gitweb: split test suite into library and tests gitweb: improve snapshot error handling

Merge branch 'maint'

2009-08-28T05:01:01Z

* maint: Fix overridable written with an extra 'e' Documentation: git-archive: mark --format as optional in summary Round-down years in "years+months" relative date view

Merge branch 'maint-1.6.3' into maint

2009-08-28T03:42:42Z

* maint-1.6.3: Fix overridable written with an extra 'e' Documentation: git-archive: mark --format as optional in summary Round-down years in "years+months" relative date view

Merge branch 'maint-1.6.2' into maint-1.6.3

2009-08-28T03:42:38Z

* maint-1.6.2: Fix overridable written with an extra 'e' Documentation: git-archive: mark --format as optional in summary Round-down years in "years+months" relative date view Conflicts: Documentation/git-archive.txt

Fix overridable written with an extra 'e'

2009-08-28T03:41:48Z

Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano

gitweb: improve snapshot error handling

2009-08-25T23:33:06Z

The last check in the second block of checks in the &git_snapshot routine is never executed because the second to last check is a superset of the last check. Switch the order of the last two checks. It has the advantage of giving clients a more specific reason why they cannot get a snapshot format if the format they have chosen is disabled. Signed-off-by: Mark Rada Signed-off-by: Junio C Hamano

Merge branch 'mr/gitweb-xz'

2009-08-24T00:19:06Z

* mr/gitweb-xz: gitweb: add support for XZ compressed snapshots gitweb: update INSTALL regarding specific snapshot settings gitweb: support to globally disable a snapshot format

gitweb: pull ref markes pull out of subject element

2009-08-23T21:53:54Z

Since 4afbaef (gitweb: ref markers link to named shortlogs, 2008-09-02), ref markers that accompany the subject in views such as shortlog and history point to something different from the subject itself. Therefore, they should not be included in the same element. Benefits of the change are: * better compliance to the XHTML standards, that forbid links within links even though the restriction cannot be imposed via DTD; this also benefits visualization in some older browsers; * when hovering the subject, only the subject itself is underlined; when hovering the ref markers, only the text in the hovered ref marker is underlined; previously, hovering any written part of the subject column led to complete underlying of everything at the same time, with unpleasing effects. Signed-off-by: Giuseppe Bilotta Acked-by: Jakub Narebski Signed-off-by: Junio C Hamano

Merge branch 'zf/maint-gitweb-acname' into maint

2009-08-21T18:34:17Z

* zf/maint-gitweb-acname: gitweb: parse_commit_text encoding fix

gitweb: Optimize git-favicon.png

2009-08-15T02:49:31Z

Reduce size of git-favicon.png using a combination of optipng and pngout. From 164 bytes to 115 bytes (30% reduction). Also reduce git-logo.png's size by one byte using advcomp. Signed-off-by: Benjamin Kramer Signed-off-by: Junio C Hamano