From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 15:09:18 +0000 (+0000)
Subject: git-debrebase: test suite: introduce t-dch-commit
X-Git-Tag: archive/debian/5.0~208
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e13fa49a03cd782945cf142fa94232a183b8e753

git-debrebase: test suite: introduce t-dch-commit

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

diff --git a/tests/lib b/tests/lib
index e226637f..dd8c4d01 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1004,6 +1004,11 @@ t-commit () {
 	revision=$(( ${revision-0} + 1 ))
 }
 
+t-dch-commit () {
+	dch "$@"
+	git commit -m "dch $*" debian/changelog
+}
+
 t-git-config () {
 	git config --global "$@"
 }
diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 7608a129..2dbb5154 100755
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -63,9 +63,8 @@ gbp import-orig --upstream-version=2.0 ../$ust
 
 not-gdr-processable
 
-dch -v 2.0-1 -m 'new upstream (did gbp import-orig)'
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
+t-dch-commit -r sid
 
 t-archive-none $p
 t-git-none
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 30786fee..3efd063d 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -9,8 +9,7 @@ t-setup-import gbp2gdr
 cd $p
 
 v=2.0-3
-dch -v $v -m testing
-git commit -m changelog debian/changelog
+t-dch-commit -v $v -m testing
 
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
@@ -28,8 +27,7 @@ for f in debian/zorkmid src.c; do
 done
 git commit -m 'MIXED add boths'
 
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -r sid
 
 git tag t.before