From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 19:23:02 +0000 (+0000)
Subject: git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date
X-Git-Tag: archive/debian/5.0~173
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=5b79751a25c556b457c0c429041bee2219d552f0

git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date

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

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 9bb9983d..8a210371 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -95,6 +95,7 @@ t-setup-done '' "$(echo $p*) git mirror salsa aq" '
 	. $troot/lib-gdr
 	t-tstunt-parsechangelog
 	p=example
+	t-git-next-date
 '
 
 t-ok
diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 62ae1241..3d8d954a 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -9,15 +9,18 @@ t-setup-import gdr-convert-gbp
 cd $p
 
 nmu-upload-1 () {
+	t-git-next-date
 	nmubranch=$1
 	git checkout -f -b $nmubranch
 	t-git-debrebase
 	t-git-debrebase convert-to-gbp
+	t-git-next-date
 	# now we are on a gbp patched-unapplied branch
 }
 
 
 nmu-upload-2 () {
+	t-git-next-date
 	t-dch-commit -v $v -m "nmu $nmubranch $v"
 	t-some-changes "nmu $numbranch $v"
 	t-dch-commit -r sid
@@ -30,6 +33,7 @@ nmu-upload-2 () {
 	dput -c $tmp/dput.cf test-dummy $c
 
 	t-archive-process-incoming sid
+	t-git-next-date
 	cd $p
 	git checkout master
 }
@@ -44,7 +48,9 @@ nmu-upload-2
 : 'done the nmu, switching back to the maintainer hat'
 
 nmu-fold () {
+	t-git-next-date
 	t-dgit fetch
+	t-git-next-date
 	git merge --ff-only dgit/dgit/sid
 
 	git diff --exit-code patch-queue/$nmubranch