gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}

This makes it possible to run gitweb under mod_perl's Apache::Registry.

It needs a fairly new git version, with --git-dir=<path>
parameter to git wrapper, i.e. post v1.4.2-rc2-g6acbcb9 version.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1430a7a8aa5cb9b881f54df83c06a36412451d5c..352236bc44ca8a3dc4951a449998c4938e15af5d 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -157,6 +157,9 @@ require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
 # version of the core git binary
 our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
 
+# path to the current git repository
+our $git_dir;
+
 $projects_list ||= $projectroot;
 
 # ======================================================================
@@ -184,7 +187,7 @@ if (defined $project) {
        if (!(-e "$projectroot/$project/HEAD")) {
                die_error(undef, "No such project");
        }
-       $ENV{'GIT_DIR'} = "$projectroot/$project";
+       $git_dir = "$projectroot/$project";
 }
 
 our $file_name = $cgi->param('f');
@@ -572,21 +575,31 @@ sub format_diff_line {
 ## ----------------------------------------------------------------------
 ## git utility subroutines, invoking git commands
 
+# returns path to the core git executable and the --git-dir parameter as list
+sub git_cmd {
+       return $GIT, '--git-dir='.$git_dir;
+}
+
+# returns path to the core git executable and the --git-dir parameter as string
+sub git_cmd_str {
+       return join(' ', git_cmd());
+}
+
 # get HEAD ref of given project as hash
 sub git_get_head_hash {
        my $project = shift;
-       my $oENV = $ENV{'GIT_DIR'};
+       my $o_git_dir = $git_dir;
        my $retval = undef;
-       $ENV{'GIT_DIR'} = "$projectroot/$project";
-       if (open my $fd, "-|", $GIT, "rev-parse", "--verify", "HEAD") {
+       $git_dir = "$projectroot/$project";
+       if (open my $fd, "-|", git_cmd(), "rev-parse", "--verify", "HEAD") {
                my $head = <$fd>;
                close $fd;
                if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) {
                        $retval = $1;
                }
        }
-       if (defined $oENV) {
-               $ENV{'GIT_DIR'} = $oENV;
+       if (defined $o_git_dir) {
+               $git_dir = $o_git_dir;
        }
        return $retval;
 }
@@ -595,7 +608,7 @@ sub git_get_head_hash {
 sub git_get_type {
        my $hash = shift;
 
-       open my $fd, "-|", $GIT, "cat-file", '-t', $hash or return;
+       open my $fd, "-|", git_cmd(), "cat-file", '-t', $hash or return;
        my $type = <$fd>;
        close $fd or return;
        chomp $type;
@@ -609,7 +622,7 @@ sub git_get_project_config {
        $key =~ s/^gitweb\.//;
        return if ($key =~ m/\W/);
 
-       my @x = ($GIT, 'repo-config');
+       my @x = (git_cmd(), 'repo-config');
        if (defined $type) { push @x, $type; }
        push @x, "--get";
        push @x, "gitweb.$key";
@@ -625,7 +638,7 @@ sub git_get_hash_by_path {
 
        my $tree = $base;
 
-       open my $fd, "-|", $GIT, "ls-tree", $base, "--", $path
+       open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path
                or die_error(undef, "Open git-ls-tree failed");
        my $line = <$fd>;
        close $fd or return undef;
@@ -756,7 +769,7 @@ sub git_get_references {
                open $fd, "$projectroot/$project/info/refs"
                        or return;
        } else {
-               open $fd, "-|", $GIT, "ls-remote", "."
+               open $fd, "-|", git_cmd(), "ls-remote", "."
                        or return;
        }
 
@@ -777,7 +790,7 @@ sub git_get_references {
 sub git_get_rev_name_tags {
        my $hash = shift || return undef;
 
-       open my $fd, "-|", $GIT, "name-rev", "--tags", $hash
+       open my $fd, "-|", git_cmd(), "name-rev", "--tags", $hash
                or return;
        my $name_rev = <$fd>;
        close $fd;
@@ -825,7 +838,7 @@ sub parse_tag {
        my %tag;
        my @comment;
 
-       open my $fd, "-|", $GIT, "cat-file", "tag", $tag_id or return;
+       open my $fd, "-|", git_cmd(), "cat-file", "tag", $tag_id or return;
        $tag{'id'} = $tag_id;
        while (my $line = <$fd>) {
                chomp $line;
@@ -866,7 +879,7 @@ sub parse_commit {
                @commit_lines = @$commit_text;
        } else {
                $/ = "\0";
-               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", "--max-count=1", $commit_id
+               open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", "--max-count=1", $commit_id
                        or return;
                @commit_lines = split '\n', <$fd>;
                close $fd or return;
@@ -1935,7 +1948,7 @@ sub git_project_list {
                if (!defined $head) {
                        next;
                }
-               $ENV{'GIT_DIR'} = "$projectroot/$pr->{'path'}";
+               $git_dir = "$projectroot/$pr->{'path'}";
                my %co = parse_commit($head);
                if (!%co) {
                        next;
@@ -2054,7 +2067,8 @@ sub git_summary {
        }
        print "</table>\n";
 
-       open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_get_head_hash($project)
+       open my $fd, "-|", git_cmd(), "rev-list", "--max-count=17",
+               git_get_head_hash($project)
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
@@ -2132,7 +2146,7 @@ sub git_blame2 {
        if ($ftype !~ "blob") {
                die_error("400 Bad Request", "Object is not a blob");
        }
-       open ($fd, "-|", $GIT, "blame", '-l', $file_name, $hash_base)
+       open ($fd, "-|", git_cmd(), "blame", '-l', $file_name, $hash_base)
                or die_error(undef, "Open git-blame failed");
        git_header_html();
        my $formats_nav =
@@ -2197,7 +2211,7 @@ sub git_blame {
                $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
                        or die_error(undef, "Error lookup file");
        }
-       open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base)
+       open ($fd, "-|", git_cmd(), "annotate", '-l', '-t', '-r', $file_name, $hash_base)
                or die_error(undef, "Open git-annotate failed");
        git_header_html();
        my $formats_nav =
@@ -2318,7 +2332,7 @@ sub git_blob_plain {
                }
        }
        my $type = shift;
-       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
+       open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or die_error(undef, "Couldn't cat $file_name, $hash");
 
        $type ||= blob_mimetype($fd, $file_name);
@@ -2360,7 +2374,7 @@ sub git_blob {
                }
        }
        my $have_blame = gitweb_check_feature('blame');
-       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
+       open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or die_error(undef, "Couldn't cat $file_name, $hash");
        my $mimetype = blob_mimetype($fd, $file_name);
        if ($mimetype !~ m/^text\//) {
@@ -2425,7 +2439,7 @@ sub git_tree {
                }
        }
        $/ = "\0";
-       open my $fd, "-|", $GIT, "ls-tree", '-z', $hash
+       open my $fd, "-|", git_cmd(), "ls-tree", '-z', $hash
                or die_error(undef, "Open git-ls-tree failed");
        my @entries = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading tree failed");
@@ -2528,7 +2542,8 @@ sub git_snapshot {
                           -content_disposition => "inline; filename=\"$filename\"",
                           -status => '200 OK');
 
-       open my $fd, "-|", "$GIT tar-tree $hash \'$project\' | $command" or
+       my $git_command = git_cmd_str();
+       open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
                die_error(undef, "Execute git-tar-tree failed.");
        binmode STDOUT, ':raw';
        print <$fd>;
@@ -2548,7 +2563,7 @@ sub git_log {
        my $refs = git_get_references();
 
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
@@ -2603,7 +2618,7 @@ sub git_commit {
        if (!defined $parent) {
                $parent = "--root";
        }
-       open my $fd, "-|", $GIT, "diff-tree", '-r', @diff_opts, $parent, $hash
+       open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $parent, $hash
                or die_error(undef, "Open git-diff-tree failed");
        my @difftree = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading git-diff-tree failed");
@@ -2710,7 +2725,7 @@ sub git_blobdiff {
        if (defined $hash_base && defined $hash_parent_base) {
                if (defined $file_name) {
                        # read raw output
-                       open $fd, "-|", $GIT, "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base,
+                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base,
                                "--", $file_name
                                or die_error(undef, "Open git-diff-tree failed");
                        @difftree = map { chomp; $_ } <$fd>;
@@ -2728,7 +2743,7 @@ sub git_blobdiff {
                        # try to find filename from $hash
 
                        # read filtered raw output
-                       open $fd, "-|", $GIT, "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base
+                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base
                                or die_error(undef, "Open git-diff-tree failed");
                        @difftree =
                                # ':100644 100644 03b21826... 3b93d5e7... M     ls-files.c'
@@ -2762,7 +2777,7 @@ sub git_blobdiff {
                }
 
                # open patch output
-               open $fd, "-|", $GIT, "diff-tree", '-r', @diff_opts,
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                        '-p', $hash_parent_base, $hash_base,
                        "--", $file_name
                        or die_error(undef, "Open git-diff-tree failed");
@@ -2798,7 +2813,7 @@ sub git_blobdiff {
                }
 
                # open patch output
-               open $fd, "-|", $GIT, "diff", '-p', @diff_opts, $hash_parent, $hash
+               open $fd, "-|", git_cmd(), "diff", '-p', @diff_opts, $hash_parent, $hash
                        or die_error(undef, "Open git-diff failed");
        } else  {
                die_error('404 Not Found', "Missing one of the blob diff parameters")
@@ -2883,7 +2898,7 @@ sub git_commitdiff {
        my $fd;
        my @difftree;
        if ($format eq 'html') {
-               open $fd, "-|", $GIT, "diff-tree", '-r', @diff_opts,
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                        "--patch-with-raw", "--full-index", $hash_parent, $hash
                        or die_error(undef, "Open git-diff-tree failed");
 
@@ -2894,7 +2909,7 @@ sub git_commitdiff {
                }
 
        } elsif ($format eq 'plain') {
-               open $fd, "-|", $GIT, "diff-tree", '-r', @diff_opts,
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                        '-p', $hash_parent, $hash
                        or die_error(undef, "Open git-diff-tree failed");
 
@@ -2994,7 +3009,8 @@ sub git_history {
        git_print_page_path($file_name, $ftype, $hash_base);
 
        open my $fd, "-|",
-               $GIT, "rev-list", "--full-history", $hash_base, "--", $file_name;
+               git_cmd(), "rev-list", "--full-history", $hash_base, "--", $file_name;
+
        git_history_body($fd, $refs, $hash_base, $ftype);
 
        close $fd;
@@ -3034,7 +3050,7 @@ sub git_search {
        my $alternate = 0;
        if ($commit_search) {
                $/ = "\0";
-               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash or next;
+               open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", $hash or next;
                while (my $commit_text = <$fd>) {
                        if (!grep m/$searchtext/i, $commit_text) {
                                next;
@@ -3086,7 +3102,9 @@ sub git_search {
 
        if ($pickaxe_search) {
                $/ = "\n";
-               open my $fd, "-|", "$GIT rev-list $hash | $GIT diff-tree -r --stdin -S\'$searchtext\'";
+               my $git_command = git_cmd_str();
+               open my $fd, "-|", "$git_command rev-list $hash | " .
+                       "$git_command diff-tree -r --stdin -S\'$searchtext\'";
                undef %co;
                my @files;
                while (my $line = <$fd>) {
@@ -3153,7 +3171,7 @@ sub git_shortlog {
        my $refs = git_get_references();
 
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
@@ -3181,7 +3199,7 @@ sub git_shortlog {
 
 sub git_rss {
        # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
-       open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_get_head_hash($project)
+       open my $fd, "-|", git_cmd(), "rev-list", "--max-count=150", git_get_head_hash($project)
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading git-rev-list failed");
@@ -3204,7 +3222,7 @@ XML
                        last;
                }
                my %cd = parse_date($co{'committer_epoch'});
-               open $fd, "-|", $GIT, "diff-tree", '-r', @diff_opts,
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                        $co{'parent'}, $co{'id'}
                        or next;
                my @difftree = map { chomp; $_ } <$fd>;
@@ -3262,7 +3280,7 @@ XML
                if (!defined $head) {
                        next;
                }
-               $ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
+               $git_dir = "$projectroot/$proj{'path'}";
                my %co = parse_commit($head);
                if (!%co) {
                        next;