about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-12-25 06:52:03 +0000
committerEric Wong <e@80x24.org>2016-12-25 10:27:56 +0000
commit292ca34140489da2c3458e1d45da5a9ae4af540d (patch)
tree3d1218282af7f085ac4d8cad947fce9c655054f1 /lib
parent1aff1f07b5f6acc661aefc0d6fc1d744e6f8025d (diff)
downloadpublic-inbox-292ca34140489da2c3458e1d45da5a9ae4af540d.tar.gz
Fewer conditionals means theres fewer code paths to test
and makes things easier-to-read.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/GitHTTPBackend.pm15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 86b8ebcc..4ad3fd1e 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -46,6 +46,9 @@ sub r ($;$) {
 sub serve {
         my ($env, $git, $path) = @_;
 
+        # XXX compatibility... ugh, can we stop supporting this?
+        $git = PublicInbox::Git->new($git) unless ref($git);
+
         # Documentation/technical/http-protocol.txt in git.git
         # requires one and exactly one query parameter:
         if ($env->{QUERY_STRING} =~ /\Aservice=git-\w+-pack\z/ ||
@@ -98,7 +101,7 @@ sub serve_dumb {
                 return r(404);
         }
 
-        my $f = (ref $git ? $git->{git_dir} : $git) . '/' . $path;
+        my $f = $git->{git_dir} . '/' . $path;
         return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
         my $size = -s _;
 
@@ -196,14 +199,8 @@ sub serve_smart {
                 my $val = $env->{$name};
                 $env{$name} = $val if defined $val;
         }
-        my ($git_dir, $limiter);
-        if (ref $git) {
-                $limiter = $git->{-httpbackend_limiter} || $default_limiter;
-                $git_dir = $git->{git_dir};
-        } else {
-                $limiter = $default_limiter;
-                $git_dir = $git;
-        }
+        my $limiter = $git->{-httpbackend_limiter} || $default_limiter;
+        my $git_dir = $git->{git_dir};
         $env{GIT_HTTP_EXPORT_ALL} = '1';
         $env{PATH_TRANSLATED} = "$git_dir/$path";
         my $rdr = { 0 => fileno($in) };