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

Merge branch 'pb/maint-gitweb-blob-lineno' into maint

2009-11-16T07:07:38Z

* pb/maint-gitweb-blob-lineno: gitweb: Fix blob linenr links in pathinfo mode

Merge branch 'gb/maint-gitweb-esc-param' into maint

2009-11-16T00:37:39Z

* gb/maint-gitweb-esc-param: gitweb: fix esc_param

gitweb: Fix blob linenr links in pathinfo mode

2009-11-06T17:56:34Z

In pathinfo mode, we use that refers to the base location of gitweb in order for various external media links to work well. However, this means that for the page to refer to itself, it must regenerate full link, and this is exactly what the blob view page did not do for line numbers. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

gitweb: fix esc_param

2009-10-14T08:14:45Z

The custom CGI escaping done in esc_param failed to escape UTF-8 properly. Fix by using CGI::escape on each sequence of matched characters instead of sprintf()ing a custom escaping for each byte. Additionally, the space -> + escape was being escaped due to greedy matching on the first substitution. Fix by adding space to the list of characters not handled on the first substitution. Finally, remove an unnecessary escaping of the + sign. Signed-off-by: Giuseppe Bilotta Signed-off-by: Junio C Hamano

gitweb: Do not show 'patch' link for merge commits

2009-10-09T21:57:06Z

The 'patch' view is about generating text/plain patch that can be given to "git am", and "git am" doesn't understand merges anyway. Therefore link to 'patch' view should not be shown for merge commits. Also call to git-format-patch inside the 'patch' action would fail when 'patch' action is called for a merge commit, with "Reading git-format-patch failed" text as 'patch' view body. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

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