chiark / gitweb /
When quilt linearisation fails, print the right information in the error message...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Aug 2015 15:18:09 +0000 (16:18 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Aug 2015 15:18:09 +0000 (16:18 +0100)
debian/changelog
dgit

index cd360c6..9f4ca75 100644 (file)
@@ -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 916177c..7c76a6f 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) = @_;