From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Jul 2018 23:50:17 +0000 (+0100)
Subject: git-debrebase: Improve grammar if one blocking snag.
X-Git-Tag: archive/debian/5.8~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=efc587b04a40fb84004690694004ec4641bb82dd;p=dgit.git

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 4acfcb81..f9e2afae 100644
--- 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 c28a775c..f16a89c1 100755
--- 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;
 	}
     }