From: Junio C Hamano <gitster@pobox.com>
To: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>,
Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org, "Holger Weiß" <holger@zedat.fu-berlin.de>
Subject: Re: [PATCH/RESEND] gitweb: Fix snapshots requested via PATH_INFO
Date: Tue, 14 Apr 2009 23:40:48 -0700 [thread overview]
Message-ID: <7vvdp6xvv3.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20090414104648.GA36554444@CIS.FU-Berlin.DE> (Holger Weiß's message of "Tue, 14 Apr 2009 12:46:48 +0200")
Holger Weiß <holger@zedat.fu-berlin.de> writes:
> Fix the detection of the requested snapshot format, which failed for
> PATH_INFO URLs since the references to the hashes which describe the
> supported snapshot formats weren't dereferenced appropriately.
>
> Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de>
> ---
> I guess this one got lost. Without this patch, snapshots won't work if
> Gitweb is configured to generate PATH_INFO URLs. (Original Message-ID:
> <20090331161636.GV30233737@CIS.FU-Berlin.DE>).
The patch looks obviously correct; "our %known_snapshort_formats" maps a
name to a hashref, but the current code makes a nonsense assignment,
essentialy doing ($fmt, %opt) = ($name, $hashref), but what would I
know... I am not using gitweb actively.
These lines come from 1ec2fb5 (gitweb: retrieve snapshot format from
PATH_INFO, 2008-11-02) by Guiseppe.
Judging from the "git shortlog -n -s --grep=PATH_INFO gitweb" output, I
think I should have heard from either Guiseppe and Jakub by now if this
patch is desired. Pinging them...
> gitweb/gitweb.perl | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 33ef190..3f99361 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -688,10 +688,10 @@ sub evaluate_path_info {
> # extensions. Allowed extensions are both the defined suffix
> # (which includes the initial dot already) and the snapshot
> # format key itself, with a prepended dot
> - while (my ($fmt, %opt) = each %known_snapshot_formats) {
> + while (my ($fmt, $opt) = each %known_snapshot_formats) {
> my $hash = $refname;
> my $sfx;
> - $hash =~ s/(\Q$opt{'suffix'}\E|\Q.$fmt\E)$//;
> + $hash =~ s/(\Q$opt->{'suffix'}\E|\Q.$fmt\E)$//;
> next unless $sfx = $1;
> # a valid suffix was found, so set the snapshot format
> # and reset the hash parameter
> --
> 1.6.2.1
next parent reply other threads:[~2009-04-15 6:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090414104648.GA36554444@CIS.FU-Berlin.DE>
2009-04-15 6:40 ` Junio C Hamano [this message]
2009-04-15 9:33 ` [PATCH/RESEND] gitweb: Fix snapshots requested via PATH_INFO Giuseppe Bilotta
2009-04-15 10:09 ` Holger Weiß
2009-04-15 11:29 ` Giuseppe Bilotta
2009-04-15 17:34 ` Jakub Narebski
2009-04-20 9:52 ` Jakub Narebski
2009-04-20 10:41 ` Junio C Hamano
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=7vvdp6xvv3.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=giuseppe.bilotta@gmail.com \
--cc=holger@zedat.fu-berlin.de \
--cc=jnareb@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).