chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4297c0a
)
git-debrebase: wip fixes for new no global $playground
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 24 Aug 2017 14:55:19 +0000
(15:55 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index c999dd62c89390f5ffdee37b2d502245515ab6bd..b2c15d6f78e26423e5216a2b3edc7cc569e84d38 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-144,21
+144,19
@@
sub D_PAT_OTH () { return 0x8; } # debian/patches other changes
our $playprefix = 'debrebase';
our $rd;
our $playprefix = 'debrebase';
our $rd;
+our $workarea;
our @git = qw(git);
sub in_workarea ($) {
my ($sub) = @_;
our @git = qw(git);
sub in_workarea ($) {
my ($sub) = @_;
- changedir
"$playground/work"
;
+ changedir
$workarea
;
my $r = eval { $sub->(); };
changedir $maindir;
}
sub fresh_workarea () {
my $r = eval { $sub->(); };
changedir $maindir;
}
sub fresh_workarea () {
- do {
- local $playground;
- fresh_playground "$playprefix/work";
- };
+ $workarea = fresh_playground "$playprefix/work";
in_workarea sub { playtree_setup };
}
in_workarea sub { playtree_setup };
}
@@
-707,8
+705,7
@@
enabledebug if $debuglevel;
my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
chdir $toplevel or die "chdir $toplevel: $!";
my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
chdir $toplevel or die "chdir $toplevel: $!";
-fresh_playground $playprefix;
-$rd = ensure_a_playground "playprefix/misc";
+$rd = fresh_playground "$playprefix/misc";
my $cmd = shift @ARGV;
my $cmdfn = $cmd;
my $cmd = shift @ARGV;
my $cmdfn = $cmd;