From 4c172c32b16c321359d4e17b3f3dd874daee4e91 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Aug 2015 16:18:09 +0100
Subject: [PATCH] When quilt linearisation fails, print the right information
 in the error message.  (This has been broken forever.)

---
 debian/changelog | 2 ++
 dgit             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cd360c6d..9f4ca75f 100644
--- 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 916177c3..7c76a6f5 100755
--- 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) = @_;
-- 
2.30.2