diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-21 01:52:05 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-21 16:22:07 +0100 |
commit | cec005037f5b62cb17094df53fb25c066d6a9705 (patch) | |
tree | 56fe62560698fa6e47bd0146a4f0da55cc6369cd /Debian | |
parent | 698dc5075b0494a8ba396e1bd0a785443b10f7ff (diff) |
git-playtree-setup: Rewrite in shell and call it from Perl
We want this because git-debpush is going to want this functionality
but doesn't want to include (or have a copy of) Dgit.pm.
The installation arrangements are rather ugly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'Debian')
-rw-r--r-- | Debian/Dgit.pm | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 3f1d1b7..9d4e78e 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -1051,23 +1051,25 @@ sub playtree_setup (;$) { $t_local_git_cfg //= $local_git_cfg; # for use in the playtree # $maindir must be set, eg by calling record_maindir or fresh_playground - runcmd qw(git init -q); - runcmd qw(git config gc.auto 0); - foreach my $copy (qw(user.email user.name user.useConfigOnly - core.sharedRepository - core.compression core.looseCompression - core.bigFileThreshold core.fsyncObjectFiles)) { - my $v = $t_local_git_cfg->{$copy}; - next unless $v; - runcmd qw(git config), $copy, $_ foreach @$v; - } # this is confusing: we have # . playtree, not a worktree, has .git/, our cwd # $maindir might be a worktree so # $maindir_gitdir contains our main working "dgit", HEAD, etc. # $maindir_gitcommon the shared stuff, including .objects - rmtree('.git/objects'); - symlink "$maindir_gitcommon/objects",'.git/objects' or confess "$!"; + + # we need to invoke git-playtree-create via git because + # there may be config options it needs which are only available + # to us, sensibly, in @git + + # And, we look for it in @INC too. This is a bit perverse. + # We do this because in the Debian packages we want to have + # a copy of this script in each binary package, rather than + # making yet another .deb or tangling the dependencies. + # @INC is conveniently available. + my $newpath = join ':', +(grep { !m/:/ } @INC), + '/usr/share/dgit', $ENV{PATH}; + runcmd qw(env), "PATH=$newpath", @git, qw(playtree-create .); + ensuredir '.git/info'; open GA, "> .git/info/attributes" or confess "$!"; print GA "* $negate_harmful_gitattrs\n" or confess "$!"; |