From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=1.0 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RP_MATCHES_RCVD shortcircuit=no autolearn=unavailable autolearn_force=no version=3.4.0 Received: (qmail 8572 invoked by uid 107); 2 Nov 2012 21:13:53 -0000 Received: from vger.kernel.org (HELO vger.kernel.org) (209.132.180.67) by peff.net (qpsmtpd/0.84) with ESMTP; Fri, 02 Nov 2012 17:13:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754154Ab2KBVNA (ORCPT ); Fri, 2 Nov 2012 17:13:00 -0400 Received: from plane.gmane.org ([80.91.229.3]:53811 "EHLO plane.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752502Ab2KBVM7 (ORCPT ); Fri, 2 Nov 2012 17:12:59 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TUOY6-00024z-HH for git@vger.kernel.org; Fri, 02 Nov 2012 22:13:06 +0100 Received: from ip68-6-43-149.sb.sd.cox.net ([68.6.43.149]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 02 Nov 2012 22:13:06 +0100 Received: from richard_hubbe11 by ip68-6-43-149.sb.sd.cox.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 02 Nov 2012 22:13:06 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: git@vger.kernel.org From: rh Subject: Re: [PATCH] gitweb.perl: fix %highlight_ext Date: Fri, 2 Nov 2012 14:18:09 -0700 Message-ID: <20121102141809.caf5cbc07f08769fd6a302ad@lavabit.com> References: <20121029094207.deafafed22ea70fbc4fbd4bb@lavabit.com> <20121102145425.GC11170@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: ip68-6-43-149.sb.sd.cox.net User-Agent: dsodnetnin X-Mailer: EZnn0.37p X-Newsreader: EZnn0.37p X-Gmane-NNTP-Posting-Host: EZnn0.37p Original-Received: from slem by 1.1 with local X-No-Archive: yes Archive: no X-Archive: expiry=11 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Status: A Peff and the Final Arbiter, On Fri, 2 Nov 2012 10:54:25 -0400 Jeff King wrote: > 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. git format-patch command wouldn't work for me. I can see that you don't need more stuff to do but not knowing git I couldn't find the correct incantation to do this part. A problem with the files not being in a git repo I think. I'll spare you details. > > 2. The commit message does not explain the reason for the change. > > 3. It isn't signed-off. These I've done and submitted the patch again. (even though format is probably not going to work with git-am. > > 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. > > -Peff Thanks for your patience and help.