diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 13:35:55 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 13:35:55 +0100 |
| commit | 11427376f5f4fef68225cebebda04f78faad5b01 (patch) | |
| tree | 292863d5baef148bfb98a701c9cf6fbd5672a162 /git-debrebase | |
| parent | 38310744b1522293aa0c95e6a6c34671d2f4dd44 (diff) | |
git-debrebase: make-patches: Handle case when there are no patches
Previously, we would bomb out.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index d0fc8fd..10dadc5 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2407,12 +2407,17 @@ sub make_patches_staged ($) { sub make_patches ($) { my ($head) = @_; keycommits $head, 0, \&snag; - make_patches_staged $head; + my $any = make_patches_staged $head; my $out; in_workarea sub { - my $ptree = cmdoutput @git, qw(write-tree --prefix=debian/patches/); + my $ptree = !$any ? undef : + cmdoutput @git, qw(write-tree --prefix=debian/patches/); runcmd @git, qw(read-tree), $head; - read_tree_subdir 'debian/patches', $ptree; + if ($ptree) { + read_tree_subdir 'debian/patches', $ptree; + } else { + rm_subdir_cached 'debian/patches'; + } $out = make_commit [$head], [ 'Commit patch queue (exported by git-debrebase)', '[git-debrebase make-patches: export and commit patches]', |