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 8711080620d589d9651ecc8655ae0c13ca203285..29ff56e6e0249dc780ecf2c89b85e455aa4d3f99 100644 (file)
--- 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 e75210805370d71b799df411fbad4ed2ead8c2b3..f06087d3cff655830af4b7cff78619b9e4584884 100755 (executable)
--- 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;
 }