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

diff --git a/debian/changelog b/debian/changelog
index b0587c6f43f458c528e5e49194b67be38343a6f2..a34f21866989c8deb9a88ca0652e60988ec40410 100644 (file)
--- 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.
 
 
   * 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
  --
 
 dgit (0.22.1) unstable; urgency=high

diff --git a/dgit b/dgit
index 31b5bf4c9359842c421709f6c2c20f50a1b5d406..0d558c0c8882f0a630d32678486aad123e8719d5 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2270,7 +2270,7 @@ sub quiltify ($$) {
            my $s = $abbrev->($notp);
            my $c = $notp->{Child};
            $s .= "..".$abbrev->($c) if $c;
            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') {
            return $s;
        };
        if ($quilt_mode eq 'linear') {

diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index 6d4efbff655d61d0b746f96d00cb540266677ff0..ed9a23d5685079b61cfff82bc1044ea9cd245bab 100755 (executable)
--- 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.
 # 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);
 
 our ($distro,$pkg, $d);
 our ($dgitlive,$repos,$suites,$diverts,$policyhook,$repo);