From 5026d3c30a7046299179ca3ba422fb21505cdf4d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Aug 2018 10:42:42 +0100
Subject: [PATCH] git-debrebase: Improve error message formatting from $bomb in
 walk

The : and ; were messed up.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 1 +
 git-debrebase    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 664a3d1f..742b752c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dgit (6.5~) unstable; urgency=medium
   * dgit: Provide print-unapplied-treeish subcommand.
   * dgit: Improve error message for unknown suite, to suggest -d.
   * git-debrebase: Properly reject bare dgit dsc imports
+  * git-debrebase: Improve some error message formatting.
 
  --
 
diff --git a/git-debrebase b/git-debrebase
index a2a14ca6..eb0acb21 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -710,8 +710,8 @@ sub walk ($;$$) {
 	if ($nogenerate) {
 	    return (undef,undef);
 	}
-	fail "found unprocessable commit, cannot cope:".
-	    (defined $cl->{Why} ? "; $cl->{Why}": '').
+	fail "found unprocessable commit, cannot cope".
+	    (defined $cl->{Why} ? "; $cl->{Why}:": ':').
 	    " (commit $cur) (d.".
 	    (join ' ', map { sprintf "%#x", $_->{Differs} }
 	     @{ $cl->{Parents} }).
-- 
2.30.2