chiark / gitweb /
git-debrebase: test suite: do not dgit pull (sets a bad example)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 11:21:51 +0000 (11:21 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:03:11 +0000 (16:03 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-import-dgit

index 0522818..a9a3187 100755 (executable)
@@ -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