chiark / gitweb /
git-debrebase: Improve grammar if one blocking snag.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 6 Jul 2018 23:50:17 +0000 (00:50 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 6 Jul 2018 23:50:19 +0000 (00:50 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog
git-debrebase

index 4acfcb8..f9e2afa 100644 (file)
@@ -6,6 +6,7 @@ dgit (5.8~) unstable; urgency=medium
   * git-debrebase status: Fix commit reporting.  Closes:903131.
   * git-debrebase new-upstream: Add a -1 revision if the user
     didn't supply one.  Closes:#903127.
+  * git-debrebase: Improve grammar if one blocking snag.
   * dgit(1): Unscramble push[-source] descriptions.  Closes:#903116.
 
  --
index c28a775..f16a89c 100755 (executable)
@@ -270,7 +270,7 @@ sub snags_maybe_bail () {
                $us, $snags_tripped;
        } else {
            fail sprintf
-  "%s: snags: %d blockers (you could -f<tag>, or --force)",
+  "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
                $us, $snags_tripped;
        }
     }