From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 29 Jun 2015 01:02:26 +0000 (+0100)
Subject: Fix an undef reference in error message processing when quilt fixup linearisation... 
X-Git-Tag: debian/0.30~39
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=5016ae374676ed5dbf594a4fde97ac5603880e4a

Fix an undef reference in error message processing when quilt fixup linearisation fails.
---

diff --git a/debian/changelog b/debian/changelog
index b0587c6f..a34f2186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,9 @@ dgit (0.23~) unstable; urgency=low
 
   * Show git config queries only with debuglevel 3 (-DDD) and higher.
 
+  * Fix an undef reference in error message processing when quilt
+    fixup linearisation fails.
+
  --
 
 dgit (0.22.1) unstable; urgency=high
diff --git a/dgit b/dgit
index 31b5bf4c..0d558c0c 100755
--- a/dgit
+++ b/dgit
@@ -2270,7 +2270,7 @@ sub quiltify ($$) {
 	    my $s = $abbrev->($notp);
 	    my $c = $notp->{Child};
 	    $s .= "..".$abbrev->($c) if $c;
-	    $s .= ": ".$c->{Whynot};
+	    $s .= ": ".$notp->{Whynot};
 	    return $s;
 	};
 	if ($quilt_mode eq 'linear') {
diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index 6d4efbff..ed9a23d5 100755
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -32,6 +32,7 @@ our $qre = '["'."']?";
 # diverts should be list of
 #  <pat> [<divert-to>]
 # where <pat> is a package name pattern which may contain * or literals.
+# <divert-to> is for `git config dgit-distro.DISTRO.diverts.<divert-to>'
 
 our ($distro,$pkg, $d);
 our ($dgitlive,$repos,$suites,$diverts,$policyhook,$repo);