Git.pm: Always set Repository to absolute path if autodetecting
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> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
da159c7759
commit
fe53bbc9be
@ -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');
|
||||
|
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user