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>
Sun, 18 Feb 2018 12:04:45 +0000 (12:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-import-dgit

index b1e77298f6b66b52bc1affa8c7daaf24fb3327c1..1118ef063f9cb0baf67f0f198b7297e741c03d41 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