diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:13:08 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:13:08 +0100 |
commit | 612dca82a7f17f88835f495155fe3ff1502e336c (patch) | |
tree | b01fbfa089ecd947fcd6a2570034bc84363e4b67 /git-debrebase | |
parent | 60d8dcb7dc0e8e8463fe1a7728dd4114b3d3e52e (diff) |
git-debrebase: fresh_workarea: Support $subdir
And use this in merge_series.
NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 9 |
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(); |