Test suite: Remove refs/remotes/dgit/dgit/sid from pari-extra worktree

This, effectively, simulates a previous fetch of something.  Do this
in the actual tests instead: in this case, only necessary in
fetch-localgitonly.

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

diff --git a/tests/tests/fetch-localgitonly b/tests/tests/fetch-localgitonly
index 1177ed63500ce8cf052cf5071ea8b5f9998b6b13..9d6a2accce6122af623a56c59779d755a17623a2 100755 (executable)
--- a/tests/tests/fetch-localgitonly
+++ b/tests/tests/fetch-localgitonly
@@ -8,6 +8,10 @@ t-worktree 3-1
 cd $p
 old=`git rev-parse HEAD`
 
 cd $p
 old=`git rev-parse HEAD`
 

+# pretend that we previously fetched 3-1 (otherwise, dgit
+# is entitled to, and will, make a new history)
+git-update-ref refs/remotes/dgit/dgit/sid refs/heads/dgit/sid
+

 t-dgit pull
 
 t-cloned-fetched-good
 t-dgit pull
 
 t-cloned-fetched-good

diff --git a/tests/worktrees/pari-extra_3-1.tar b/tests/worktrees/pari-extra_3-1.tar
index 81a6a54aa4d7bb1b7fd737341d977a6f7e0e5ccb..62efeb92a3fd78803de432103ec3f436ca6038a8 100644 (file)
Binary files a/tests/worktrees/pari-extra_3-1.tar and b/tests/worktrees/pari-extra_3-1.tar differ