remove GIT_DIR env usage in favor of --git-dir

No need to maintain per-block environment state when we can
localize it to per-command.  We've had --git-dir= in git
since 1.4.2 (2006-08-12) and already use it all over the
place.

diff --git a/t/cgi.t b/t/cgi.t
index d7e3ac5b0173a886773abf8674dc39d0f457f8ec..dcbfb4ce5634e732dd704e44a6c11d9976b844d3 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -62,8 +62,7 @@ zzzzzz
 EOF
                my $in = $simple->as_string;
                run_with_env({PATH => $main_path}, [$mda], \$in);
 EOF
                my $in = $simple->as_string;
                run_with_env({PATH => $main_path}, [$mda], \$in);

-               local $ENV{GIT_DIR} = $maindir;
-               my $rev = `git rev-list HEAD`;
+               my $rev = `git --git-dir=$maindir rev-list HEAD`;

                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
        }
 
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
        }
 


@@ -85,8 +84,7 @@ what?
 EOF
                my $in = $reply->as_string;
                run_with_env({PATH => $main_path}, [$mda], \$in);
 EOF
                my $in = $reply->as_string;
                run_with_env({PATH => $main_path}, [$mda], \$in);

-               local $ENV{GIT_DIR} = $maindir;
-               my $rev = `git rev-list HEAD`;
+               my $rev = `git --git-dir=$maindir rev-list HEAD`;

                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
        }
 
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
        }
 


@@ -169,7 +167,6 @@ EOF
                local $ENV{ORIGINAL_RECIPIENT} = $addr;
                run_with_env({PATH => $main_path}, [$mda], \$in);
        }
                local $ENV{ORIGINAL_RECIPIENT} = $addr;
                run_with_env({PATH => $main_path}, [$mda], \$in);
        }

-       local $ENV{GIT_DIR} = $maindir;

 
        my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw");
        like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,
 
        my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw");
        like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,

diff --git a/t/mda.t b/t/mda.t
index 6b7527d4ed71a8b3760e269d3d69d8df20cbbec6..ad6a09139c6f74503411a513f0b405736d99bbba 100644 (file)
--- a/t/mda.t
+++ b/t/mda.t
@@ -92,11 +92,10 @@ EOF
        {
                local $ENV{PATH} = $main_path;
                run([$mda], \$in);
        {
                local $ENV{PATH} = $main_path;
                run([$mda], \$in);

-               local $ENV{GIT_DIR} = $maindir;
-               my $rev = `git rev-list HEAD`;
+               my $rev = `git --git-dir=$maindir rev-list HEAD`;

                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
                chomp $rev;
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
                chomp $rev;

-               my $cmt = `git cat-file commit $rev`;
+               my $cmt = `git --git-dir=$maindir cat-file commit $rev`;

                like($cmt, qr/^author Me <me\@example\.com> 0 \+0000\n/m,
                        "author info set correctly");
                like($cmt, qr/^committer test <test-public\@example\.com>/m,
                like($cmt, qr/^author Me <me\@example\.com> 0 \+0000\n/m,
                        "author info set correctly");
                like($cmt, qr/^committer test <test-public\@example\.com>/m,


@@ -109,8 +108,7 @@ EOF
                ok(!-e $failbox, "nothing in PI_EMERGENCY before");
                local $ENV{PATH} = $fail_path;
                run([$mda], \$in);
                ok(!-e $failbox, "nothing in PI_EMERGENCY before");
                local $ENV{PATH} = $fail_path;
                run([$mda], \$in);

-               local $ENV{GIT_DIR} = $maindir;
-               my @revs = `git rev-list HEAD`;
+               my @revs = `git --git-dir=$maindir rev-list HEAD`;

                is(scalar @revs, 1, "bad revision not committed");
                ok(-s $failbox > 0, "PI_EMERGENCY is written to");
        }
                is(scalar @revs, 1, "bad revision not committed");
                ok(-s $failbox > 0, "PI_EMERGENCY is written to");
        }


@@ -330,8 +328,7 @@ sub fail_bad_header {
        my ($out, $err) = ("", "");
        local $ENV{PATH} = $main_path;
        run([$mda], \$in, \$out, \$err);
        my ($out, $err) = ("", "");
        local $ENV{PATH} = $main_path;
        run([$mda], \$in, \$out, \$err);

-       local $ENV{GIT_DIR} = $maindir;
-       my $rev = `git rev-list HEAD`;
+       my $rev = `git --git-dir=$maindir rev-list HEAD`;

        chomp $rev;
        is($rev, $good_rev, "bad revision not commited ($msg)");
        ok(-s $failbox > 0, "PI_EMERGENCY is written to ($msg)");
        chomp $rev;
        is($rev, $good_rev, "bad revision not commited ($msg)");
        ok(-s $failbox > 0, "PI_EMERGENCY is written to ($msg)");