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

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 3d74d0ebc3876f1cb9ca677e56c9eaf88e80d3de..d101742114246a8bd61f63c102bad234252b1eac 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -344,7 +344,7 @@ sub gbp_pq_export ($$$) {
        { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
        failedcmd @gbp_cmd;
     }
-    runcmd @git, qw(add -f debian/patches);
+    runcmd @git, qw(add -f debian/patches) if stat_exists 'debian/patches';
 }
 
 
@@ -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:".