All of lore.kernel.org
 help / color / mirror / Atom feed
From: Krzesimir Nowak <krzesimir@endocode.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
	"Git List" <git@vger.kernel.org>,
	"Jakub Narębski" <jnareb@gmail.com>
Subject: Re: [PATCH v2] gitweb: Add an option for adding more branch refs
Date: Thu, 28 Nov 2013 12:49:17 +0100	[thread overview]
Message-ID: <1385639357.2075.3.camel@localhost.localdomain> (raw)
In-Reply-To: <xmqqob55sgww.fsf@gitster.dls.corp.google.com>

On Wed, 2013-11-27 at 12:55 -0800, Junio C Hamano wrote:
> Eric Sunshine <sunshine@sunshineco.com> writes:
> 
> > On Wed, Nov 27, 2013 at 3:34 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
> >> On Wed, Nov 27, 2013 at 10:30 AM, Krzesimir Nowak
> >> <krzesimir@endocode.com> wrote:
> >>> Overriding an @additional_branch_refs configuration variable with
> >>> value ('wip') will make gitweb to show branches that appear in
> >>> refs/heads and refs/wip (refs/heads is hardcoded).
> 
> "branches" are by definition what are in refs/heads/ hierarchy, so 
> 
>   Allow @additional_branch_refs configuration variable to tell
>   gitweb to show refs from additional hierarchies in addition to
>   branches in the list-of-branches view.
> 
> would be more appropriate and sufficient.

Thanks.

> 
> >> Mentioning $ref in the error message would help the user resolve the
> >> problem more quickly.
> >>
> >>> +               die_error(500, '"heads" specified in @additional_branch_refs') if ($ref eq 'heads');
> >>
> >> Rephrasing this as
> >>
> >>     "heads" disallowed in @additional_branch_refs
> >>
> >> would better explain the problem to a user who has only made a cursory
> >> read of the documentation.
> >
> > The program could easily filter out the redundant 'heads', so does
> > this really deserve a diagnostic?
> 
> True.

Ok, I'm deduping both heads and other refs as well. Now we send 500 only
if the ref is simply invalid.

> 
> I was primarily worried about metacharacters in the specified
> strings getting in the way of regexp matches the new code allows on
> them, but that has been resolved with the use of \Q..\E; if that
> automatic deduping is done, I do not immediately see any remaining
> issues in the latest round of the patch.
> 

New patch in "[PATCH v3] gitweb: Add an option for adding more branch
refs". Thanks for reviews!

> Thanks.

-- 
Krzesimir Nowak
Software Developer
Endocode AG

krzesimir@endocode.com

------
Endocode AG, Johannisstraße 20, 10117 Berlin
info@endocode.com | www.endocode.com

Vorstandsvorsitzender: Mirko Boehm
Vorstände: Dr. Karl Beecher, Chris Kühl, Sebastian Sucker
Aufsichtsratsvorsitzende: Jennifer Beecher

Registergericht: Amtsgericht Charlottenburg - HRB 150748 B

      reply	other threads:[~2013-11-28 11:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-27 15:30 [PATCH v2] gitweb: Add an option for adding more branch refs Krzesimir Nowak
2013-11-27 20:34 ` Eric Sunshine
2013-11-27 20:38   ` Eric Sunshine
2013-11-27 20:55     ` Junio C Hamano
2013-11-28 11:49       ` Krzesimir Nowak [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1385639357.2075.3.camel@localhost.localdomain \
    --to=krzesimir@endocode.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.