From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 15:59:18 +0000 (+0100)
Subject: git-debrebase: merge: Do not crash on branches with no delta queue
X-Git-Tag: archive/debian/6.7~103
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=c1e0f468347b80d739d6eefa9eb9d614b18c3c15

git-debrebase: merge: Do not crash on branches with no delta queue

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 7c69c4c0..d1017421 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:".