summaryrefslogtreecommitdiff
path: root/gitweb/gitweb.perl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-08 12:00:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-08 12:00:28 -0700
commitd59c12d7ad39f942fc60578ba1e934822f40445b (patch)
treef0591d6490164e7a8a672c79094a2d612899cfb7 /gitweb/gitweb.perl
parentMerge branch 'mh/update-ref-batch-create-fix' (diff)
parentcode and test: fix misuses of "nor" (diff)
downloadtgif-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.xz
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'gitweb/gitweb.perl')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 79057b7d0e..a9f57d6f90 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1490,7 +1490,7 @@ sub is_valid_pathname {
my $input = shift;
return undef unless defined $input;
- # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+ # no '.' or '..' as elements of path, i.e. no '.' or '..'
# at the beginning, at the end, and between slashes.
# also this catches doubled slashes
if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {