summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-08-14 18:28:10 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-05 13:41:48 +0100
commit80ffc69e9d5cc652a611e84df5d11d80d8995ff6 (patch)
tree6ee49ebf2ec2231cc20afd487ab9428cb2182387
parent99a299dd30639bf13efbfa7862b8dda458520393 (diff)
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>
-rwxr-xr-xtests/tests/fetch-localgitonly4
-rw-r--r--tests/worktrees/pari-extra_3-1.tarbin92160 -> 81920 bytes
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/tests/fetch-localgitonly b/tests/tests/fetch-localgitonly
index 1177ed6..9d6a2ac 100755
--- 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`
+# 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
diff --git a/tests/worktrees/pari-extra_3-1.tar b/tests/worktrees/pari-extra_3-1.tar
index 81a6a54..62efeb9 100644
--- a/tests/worktrees/pari-extra_3-1.tar
+++ b/tests/worktrees/pari-extra_3-1.tar
Binary files differ