From c1e0f468347b80d739d6eefa9eb9d614b18c3c15 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 16:59:18 +0100
Subject: git-debrebase: merge: Do not crash on branches with no delta queue

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:".
-- 
cgit v1.2.3