aboutsummaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-27 13:44:25 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-27 13:44:25 -0700
commit2dc7f40d4424f66e1324a1600de3fcdd115ab07f (patch)
tree6680ff45aeb60a73e9c6bba6d0c779473e6f0e35 /gitweb
parent3f721d1d6d6e6e55dbb5bfcb0e09346478adbb72 (diff)
parent1bed73c64a354248d6b342e58df257e8233bcbd2 (diff)
downloadgit-2dc7f40d4424f66e1324a1600de3fcdd115ab07f.tar.gz
git-2dc7f40d4424f66e1324a1600de3fcdd115ab07f.tar.xz
Merge branch 'maint'
* maint: gitweb/README: fix AliasMatch in example Test grep --and/--or/--not Test git archive --remote fread does not return negative on error
Diffstat (limited to 'gitweb')
-rw-r--r--gitweb/README10
1 files changed, 9 insertions, 1 deletions
diff --git a/gitweb/README b/gitweb/README
index ccda890c0..9056d1e09 100644
--- a/gitweb/README
+++ b/gitweb/README
@@ -377,7 +377,7 @@ named without a .git extension (e.g. /pub/git/project instead of
DocumentRoot /var/www/gitweb
- AliasMatch ^(/.*?)(\.git)(/.*)? /pub/git$1$3
+ AliasMatch ^(/.*?)(\.git)(/.*)?$ /pub/git$1$3
<Directory /var/www/gitweb>
Options ExecCGI
AddHandler cgi-script cgi
@@ -402,6 +402,14 @@ http://git.example.com/project
will provide human-friendly gitweb access.
+This solution is not 100% bulletproof, in the sense that if some project
+has a named ref (branch, tag) starting with 'git/', then paths such as
+
+http://git.example.com/project/command/abranch..git/abranch
+
+will fail with a 404 error.
+
+
Originally written by:
Kay Sievers <kay.sievers@vrfy.org>