From 08ff874d10d649cb4ac3664772ac605873445aab Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 11:21:51 +0000 Subject: git-debrebase: test suite: do not dgit pull (sets a bad example) Signed-off-by: Ian Jackson --- tests/tests/gdr-import-dgit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index 0522818..a9a3187 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -32,7 +32,8 @@ t-archive-process-incoming sid cd $p git checkout master -t-dgit pull +t-dgit fetch +git merge --ff-only dgit/dgit/sid git diff --exit-code nmu -- cgit v1.2.3