git-debrebase: Improve grammar if one blocking snag.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 4acfcb81bfedc36a12ce3f228f5d3f3070b211f2..f9e2afae17364303afbf0465280152e771ac0a23 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
 
  --

diff --git a/git-debrebase b/git-debrebase
index c28a775ce87261022855fcbb753c6d8b82ee9056..f16a89c193b7830309d820b053a1299a06daf710 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -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;
        }
     }