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>

diff --git a/debian/changelog b/debian/changelog
index 664a3d1fbef53d6f7e1d9286a05cdf8b18d21816..742b752ca41a9c4aa450187798c476a4e849e815 100644 (file)
--- 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 a2a14ca654eaaef818a7081f773d4eac5ba10ed1..eb0acb21c0ab0df27204c1afdd04437ad8d83835 100755 (executable)
--- 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} }).