From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 18:15:00 +0000 (+0000)
Subject: test suite: gbp2gdr: use -f<tag> rather than --force
X-Git-Tag: archive/debian/5.0~244
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5e8fbaadb458a16440b8f18daded9918093deb2c;p=dgit.git

test suite: gbp2gdr: use -f<tag> rather than --force

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

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 909643b2..da238f4b 100755
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -51,7 +51,7 @@ gbp import-orig --debian-branch=quilt-tip --upstream-version=2.0 ../$ust
 
 not-gdr-processable
 
-t-git-debrebase --force gbp2debrebase
+t-git-debrebase -fupstream-has-debian gbp2debrebase
 
 : xxx
 t-ok