When quilt linearisation fails, print the right information in the error message...

diff --git a/debian/changelog b/debian/changelog
index cd360c6da576fbc4025a4e9990ec7cdce5b54e39..9f4ca75f815957ae6a08984e0d5dd73860bcd03e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dgit (1.4~~) UNRELEASED; urgency=low
     filenames (which git-add treats as glob patterns).
   * When running git-add in commit-quilty-patch, use -f and sometimes -A,
     so as to avoid being broken by any .gitignore, etc.
+  * When quilt linearisation fails, print the right information in
+    the error message.  (This has been broken forever.)
 
  --
 

diff --git a/dgit b/dgit
index 916177c3cd0ed895c727abfe9dc585c6950dfe3e..7c76a6f5473f6fc97b3fa1b0e1de902c9653faa6 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2627,7 +2627,7 @@ sub quiltify ($$) {
        my $abbrev = sub {
            my $x = $_[0]{Commit};
            $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
-           return $;
+           return $x;
        };
        my $reportnot = sub {
            my ($notp) = @_;