Re: [PATCH] gitweb.perl: fix %highlight_ext
- From
- rh <richard_hubbe11@lavabit.com>
- Date
- Nov 2, 2012, 17:41 UTC
- Message-ID
- <20121102104121.4f81a160e4e6368dde3a8373@lavabit.com>
- In-Reply-To
- <20121102145425.GC11170@sigill.intra.peff.net>
On Fri, 2 Nov 2012 10:54:25 -0400 Jeff King <peff@peff.net> wrote:
Show 56 quoted lines
> On Mon, Oct 29, 2012 at 09:42:07AM -0700, rh wrote:
>
> > I also consolidated exts where applicable.
> > i.e. c and h maps to c
> >
> >
> > --
> >
> > diff --git a/a/gitweb.cgi b/b/gitweb.cgi
> > index 060db27..155b238 100755
> > --- a/a/gitweb.cgi
> > +++ b/b/gitweb.cgi
> > @@ -246,19 +246,19 @@ our %highlight_basename = (
> > 'Makefile' => 'make',
> > );
> > # match by extension
> > +
> > our %highlight_ext = (
> > # main extensions, defining name of syntax;
> > # see files in /usr/share/highlight/langDefs/ directory
> > - map { $_ => $_ }
> > - qw(py c cpp rb java css php sh pl js tex bib xml
> > awk bat ini spec tcl sql make),
> > + (map { $_ => $_ } qw(py rb java css js tex bib xml awk bat
> > ini spec tcl sql)),
> > # alternate extensions, see /etc/highlight/filetypes.conf
> > - 'h' => 'c',
> > - map { $_ => 'sh' } qw(bash zsh ksh),
> > - map { $_ => 'cpp' } qw(cxx c++ cc),
> > - map { $_ => 'php' } qw(php3 php4 php5 phps),
> > - map { $_ => 'pl' } qw(perl pm), # perhaps also 'cgi'
> > - map { $_ => 'make'} qw(mak mk),
> > - map { $_ => 'xml' } qw(xhtml html htm),
> > + (map { $_ => 'c' } qw(c h)),
> > + (map { $_ => 'sh' } qw(sh bash zsh ksh)),
> > + (map { $_ => 'cpp' } qw(cpp cxx c++ cc)),
> > + (map { $_ => 'php' } qw(php php3 php4 php5 phps)),
> > + (map { $_ => 'pl' } qw(pl perl pm)), # perhaps also 'cgi'
> > + (map { $_ => 'make'} qw(make mak mk)),
> > + (map { $_ => 'xml' } qw(xml xhtml html htm)),
>
> I think the patch itself looks OK, but:
>
> 1. It isn't formatted to apply with git-am. Please use
> git-format-patch.
>
> 2. The commit message does not explain the reason for the change.
>
> 3. It isn't signed-off.
>
> The first two are things I can fix up (though it is inconvenient for
> me to do so), but the third is a show-stopper. Please look through
> Documentation/SubmittingPatches, especially the bit about the
> Developer's Certificate of Origin, and re-send.
>
> -PeffThanks for taking the time to explain the workflow. If I can figure all this out I will try to do what's needed. This is feeling like a strange cult that I've bumped into!
-- "...she's got smarts and never farts and owns a chain of liquor stores."