From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 21 Aug 2018 01:08:39 +0000 (+0100)
Subject: dgit: do not crash on push of a new gdr package.  Closes:#906784.
X-Git-Tag: archive/debian/6.9~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6f3e3449c7f62594e48df4f5851b08b7366fb5dc

dgit: do not crash on push of a new gdr package.  Closes:#906784.

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

diff --git a/debian/changelog b/debian/changelog
index 87110806..29ff56e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 dgit (6.9~) unstable; urgency=medium
 
-  * 
+  * dgit: do not crash on push of a new gdr package.  Closes:#906784.
 
  --
 
diff --git a/dgit b/dgit
index e7521080..f06087d3 100755
--- a/dgit
+++ b/dgit
@@ -311,7 +311,7 @@ sub branch_is_gdr_unstitched_ff ($$$) {
     my ($symref, $head, $ancestor) = @_;
     my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
     return 0 unless $ffq_prev;
-    return 0 unless is_fast_fwd $ancestor, $ffq_prev;
+    return 0 unless !defined $ancestor or is_fast_fwd $ancestor, $ffq_prev;
     return 1;
 }