worktree support: Fix ensure_a_playground (gives absolute path now)

Make it honour $maindir_gitdir so it will DTRT in a `git worktree'.
The .git/dgit play area ends up in the .git/worktrees/<worktreename>
for this worktree.

It now returns an absolute path.  The only call site that needs
adjusting is the one in fresh_playground.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index b678ba53ead7cba05a4d579ebef5ae1f5f5df6c9..52e192e2ee0ed646e5887ba8266c2275dcc99ec9 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -543,7 +543,7 @@ our $playground;
 sub ensure_a_playground_parent ($) {
     my ($spc) = @_;
     record_maindir();
 sub ensure_a_playground_parent ($) {
     my ($spc) = @_;
     record_maindir();

-    $spc = ".git/$spc";
+    $spc = "$maindir_gitdir/$spc";

     my $parent = dirname $spc;
     mkdir $parent or $!==EEXIST
        or fail "failed to mkdir playground parent $parent: $!";
     my $parent = dirname $spc;
     mkdir $parent or $!==EEXIST
        or fail "failed to mkdir playground parent $parent: $!";


@@ -562,7 +562,7 @@ sub fresh_playground ($) {
     $spc = ensure_a_playground_parent $spc;
     rmtree $spc;
     mkdir $spc or die "$spc $!";
     $spc = ensure_a_playground_parent $spc;
     rmtree $spc;
     mkdir $spc or die "$spc $!";

-    return $playground = "$maindir/$spc";
+    return $playground = $spc;

 }
 
 # ----- playtrees -----
 }
 
 # ----- playtrees -----