diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-21 02:08:39 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-21 02:08:41 +0100 |
commit | 6f3e3449c7f62594e48df4f5851b08b7366fb5dc (patch) | |
tree | b2ada6280348cbff898c9da69b84cb76d67a16dd | |
parent | ebfc4c43791dc67d5f5b22aca654b8a1ab54f394 (diff) |
dgit: do not crash on push of a new gdr package. Closes:#906784.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8711080..29ff56e 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. -- @@ -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; } |