diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
commit | 3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch) | |
tree | 5f5b11703f64319bcb71603c825d382f4703a763 /gitweb | |
parent | fbae3d9ace0b71f8db62cde127fa6fe24c40380c (diff) | |
parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
download | git-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.gz git-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.xz |
Merge branch 'jl/nor-or-nand-and' into maint
* 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')
-rwxr-xr-x | gitweb/gitweb.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 3bc0f0b5c..52108b925 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!(^|/)(|\.|\.\.)(/|$)!) { |