summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-07 00:50:17 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-07 00:50:19 +0100
commitefc587b04a40fb84004690694004ec4641bb82dd (patch)
tree0b27980c70dcf1664d3ac9355fc46a5a5d7ab05d
parent422f18bf5da933f789e8b2b818d558a66f4d5dcf (diff)
git-debrebase: Improve grammar if one blocking snag.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog1
-rwxr-xr-xgit-debrebase2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 4acfcb8..f9e2afa 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 c28a775..f16a89c 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;
}
}