diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 16:59:18 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 17:05:56 +0100 |
| commit | c1e0f468347b80d739d6eefa9eb9d614b18c3c15 (patch) | |
| tree | 546381550611f556441af111c3786ccf39504d17 /git-debrebase | |
| parent | 8c4cbc9eafaff67f8029512a0b5e710fb5278390 (diff) | |
git-debrebase: merge: Do not crash on branches with no delta queue
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 7c69c4c..d101742 100755 --- a/git-debrebase +++ b/git-debrebase @@ -423,7 +423,7 @@ sub merge_series ($$$;@) { " $q->{SeriesTip}]" ]; printdebug "merge_series pec $pec "; - runcmd @git, qw(rm -q --cached), $seriesfile; + runcmd @git, qw(rm -q --ignore-unmatch --cached), $seriesfile; $pec = make_commit [ $pec ], [ "Drop series file from $s to avoid merge trouble", "[git-debrebase merge-innards patch-queue prep:". |