summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-debrebase9
1 files changed, 6 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase
index 7f96749..3ac087c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -128,8 +128,10 @@ sub in_workarea ($) {
die $@ if $@;
}
-sub fresh_workarea () {
- $workarea = fresh_playground "$playprefix/work";
+sub fresh_workarea (;$) {
+ my ($subdir) = @_;
+ $subdir //= 'work';
+ $workarea = fresh_playground "$playprefix/$subdir";
in_workarea sub { playtree_setup };
}
@@ -450,7 +452,8 @@ sub merge_series ($$$;@) {
}
};
- local $workarea = fresh_playground "$playprefix/merge";
+ local $workarea;
+ fresh_workarea "merge";
my $seriesfile = "debian/patches/series";
in_workarea sub {
playtree_setup();