From 5b79751a25c556b457c0c429041bee2219d552f0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 19:23:02 +0000 Subject: git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date Signed-off-by: Ian Jackson --- tests/setup/gdr-convert-gbp | 1 + tests/tests/gdr-import-dgit | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index 9bb9983..8a21037 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 62ae124..3d8d954 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 -- cgit v1.2.3