From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Aug 2016 11:09:32 +0000 (+0100)
Subject: Test suite: t-commit: honour $majorv for major version
X-Git-Tag: archive/debian/2.0~205
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=dce35223f0ded3dfaa1acb4a6ad62d8ab840ddf9

Test suite: t-commit: honour $majorv for major version

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

diff --git a/tests/lib b/tests/lib
index 82ef7c26..9b8894ef 100644
--- a/tests/lib
+++ b/tests/lib
@@ -654,7 +654,7 @@ t-gbp-example-prep () {
 
 t-commit () {
 	local msg=$1
-	v=${2:-1.$revision}
+	v=${2:-${majorv:-1}.$revision}
 	dch -v$v --distribution ${3:-unstable} "$1"
 	git add debian/changelog
 	debcommit