[PATCH RESEND] Git.pm: Always set Repository to absolute path if autodetecting
- From
Frank Lichtenheld <frank@lichtenheld.de>
- Date
- May 7, 2009, 13:41 UTC
- Message-ID
- <1241703688-6892-2-git-send-email-frank@lichtenheld.de>
- In-Reply-To
- <1241703688-6892-1-git-send-email-frank@lichtenheld.de>
From: Frank Lichtenheld <flichtenheld@astaro.com>
So far we only set it to absolute paths in some cases which lead to problems like wc_chdir not working.
Signed-off-by: Frank Lichtenheld <flichtenheld@astaro.com> --- perl/Git.pm | 2 +- t/t9700/test.pl | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-)
Resent unchanged. There was one comment which I've reponded too and argued that it didn't apply and there was no further objections.
diff --git a/perl/Git.pm b/perl/Git.pm index 4313db7..e8df55d 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -185,7 +185,7 @@ sub repository { if ($dir) { $dir =~ m#^/# or $dir = $opts{Directory} . '/' . $dir; - $opts{Repository} = $dir; + $opts{Repository} = abs_path($dir); # If --git-dir went ok, this shouldn't die either. my $prefix = $search->command_oneline('rev-parse', '--show-prefix'); diff --git a/t/t9700/test.pl b/t/t9700/test.pl index d9b29ea..6c70aec 100755 --- a/t/t9700/test.pl +++ b/t/t9700/test.pl @@ -86,18 +86,12 @@ close TEMPFILE; unlink $tmpfile; # paths -is($r->repo_path, "./.git", "repo_path"); +is($r->repo_path, $abs_repo_dir . "/.git", "repo_path"); is($r->wc_path, $abs_repo_dir . "/", "wc_path"); is($r->wc_subdir, "", "wc_subdir initial"); $r->wc_chdir("directory1"); is($r->wc_subdir, "directory1", "wc_subdir after wc_chdir"); -TODO: { - local $TODO = "commands do not work after wc_chdir"; - # Failure output is active even in non-verbose mode and thus - # annoying. Hence we skip these tests as long as they fail. - todo_skip 'config after wc_chdir', 1; - is($r->config("color.string"), "value", "config after wc_chdir"); -} +is($r->config("test.string"), "value", "config after wc_chdir"); # Object generation in sub directory chdir("directory2");
-- 1.6.2.1