From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 11:21:51 +0000 (+0000)
Subject: git-debrebase: test suite: do not dgit pull (sets a bad example)
X-Git-Tag: archive/debian/5.0~190
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=08ff874d10d649cb4ac3664772ac605873445aab

git-debrebase: test suite: do not dgit pull (sets a bad example)

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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 0522818b..a9a31877 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