Bug 672293
| Summary: | Wrong --xhtml option to highlight from gitweb | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | [Fedora] Fedora | Reporter: | Michael Cronenworth <mike> | ||||||||
| Component: | git | Assignee: | Adam Tkac <atkac> | ||||||||
| Status: | CLOSED ERRATA | QA Contact: | Fedora Extras Quality Assurance <extras-qa> | ||||||||
| Severity: | unspecified | Docs Contact: | |||||||||
| Priority: | unspecified | ||||||||||
| Version: | 14 | CC: | atkac, bkearney, chrisw, jochen, lxtnow, npajkovs, ovasik, tmz | ||||||||
| Target Milestone: | --- | ||||||||||
| Target Release: | --- | ||||||||||
| Hardware: | Unspecified | ||||||||||
| OS: | Unspecified | ||||||||||
| Whiteboard: | |||||||||||
| Fixed In Version: | git-1.7.4-1.fc14 | Doc Type: | Bug Fix | ||||||||
| Doc Text: | Story Points: | --- | |||||||||
| Clone Of: | Environment: | ||||||||||
| Last Closed: | 2011-02-02 19:25:07 UTC | Type: | --- | ||||||||
| Regression: | --- | Mount Type: | --- | ||||||||
| Documentation: | --- | CRM: | |||||||||
| Verified Versions: | Category: | --- | |||||||||
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |||||||||
| Cloudforms Team: | --- | Target Upstream Version: | |||||||||
| Embargoed: | |||||||||||
| Attachments: |
|
||||||||||
|
Description
Michael Cronenworth
2011-01-24 18:23:31 UTC
Created attachment 475020 [details]
Fix highlight -xhtml option
Patch for put proper -xhtml option to highlight
Created attachment 475429 [details]
Patch to make gitweb compatible with highlight >= 3.1
After a talk with the upstream author of highlight I have modified the patch in the was, that -O xhml will be taken a options to specified the output format.
Does this work with older versions of highlight or if applied will gitweb only work with highlight >= 3.1? I'm interesting to see if the patch is applicable to send upstream so others don't get have to find and solve the same problem. The patch is for highlight 3.1 and above. (In reply to comment #3) > Does this work with older versions of highlight or if applied will gitweb only > work with highlight >= 3.1? I'm interesting to see if the patch is applicable > to send upstream so others don't get have to find and solve the same problem. I've already sent the patch to upstream. Just for information I checked the older highlight and it seems it also accepts the -O option (per manpage): $ rpm -q highlight highlight-3.0-0.2.fc14.x86_64 Created attachment 475474 [details]
Patch to make gitweb compatible with highlight >= 3.1
I have got an additional mail from the upstream author of highlight. He worte, that using of --out-format xhtml may be a better solution, because this is compatible to the 2.x and 3.x serieas of highlight.
The meaning of the shout option -O was changed in the past.
(In reply to comment #6) > Created attachment 475474 [details] > Patch to make gitweb compatible with highlight >= 3.1 > > I have got an additional mail from the upstream author of highlight. He worte, > that using of --out-format xhtml may be a better solution, because this is > compatible to the 2.x and 3.x serieas of highlight. > > The meaning of the shout option -O was changed in the past. The "--out-format" is not supported in highlight 2.4.8. As written in http://article.gmane.org/gmane.comp.version-control.git/165552 the only solution is to completely remove out format specification and rely on highlight that default format is HTML. git-1.7.4-1.fc14 has been submitted as an update for Fedora 14. https://admin.fedoraproject.org/updates/git-1.7.4-1.fc14 git-1.7.4-1.fc14 has been pushed to the Fedora 14 testing repository. If problems still persist, please make note of it in this bug report. If you want to test the update, you can install it with su -c 'yum --enablerepo=updates-testing update git'. You can provide feedback for this update here: https://admin.fedoraproject.org/updates/git-1.7.4-1.fc14 gitweb works much better now. To all involved: Thank you git-1.7.4-1.fc14 has been pushed to the Fedora 14 stable repository. If problems still persist, please make note of it in this bug report. |