From 80ffc69e9d5cc652a611e84df5d11d80d8995ff6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Aug 2016 18:28:10 +0100
Subject: [PATCH] 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>
---
 tests/tests/fetch-localgitonly     |   4 ++++
 tests/worktrees/pari-extra_3-1.tar | Bin 92160 -> 81920 bytes
 2 files changed, 4 insertions(+)

diff --git a/tests/tests/fetch-localgitonly b/tests/tests/fetch-localgitonly
index 1177ed63..9d6a2acc 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 81a6a54aa4d7bb1b7fd737341d977a6f7e0e5ccb..62efeb92a3fd78803de432103ec3f436ca6038a8 100644
GIT binary patch
delta 329
zcmZp;z}nEjx`CT%Gq)Bi(`JDQj7*c2e>qN65SsLcWpjqn3dZdMDvVWZ!sezXhDJta
zW=0GKhGxd*<_rp^lO1_ewlk_TiZE^$HDG+ryJ?y@+h*}4|Cu+7U0`9`EVbf~=w`78
zznC`*>|+z!EH;OcW3%|RpPb7D#28r?3+S+I7I*=)QuJFXs_Ev&CdP2nnHl97w<|C)
ze&Am$@QP=-fD|LkaseTb{wF{@iDk2Z2`AHL$*TXXizPak7E3s=EtW_CVl$4#5^g}c
z0Z7{c#Y2GXJRtS~^3ymrOLYBU-7HYT!M0f<>Ids~0XfFsted%+*qIg!DX?u8;$URk
jEUfl}c{4W)JIi7r369M|eD63nD|kI%#70aG;9UR!+aY3m

delta 472
zcmchQF-yZx6oq?Vl9$w|JflscXo*lkP)gdQ#8Je--{7dNR&a1ABBI!#IuwU$RtMn;
zbr2D+G>d~cI&~6p>f|Ci7NtUcD)c8feCKiwhkHsTrPNTabQ0?Qppu$lgB%(r01XGH
z;VoKEf}zz6CcH5UpAzasA)IYc&L}~45hXZ$-%+{sM7UL_+<FkaXxw_Hp+(?BL3XQ&
z=v_ojalZtYf`;%n1g+LjLk5Ba=N$=ILZv*us9`+Wk+_*Mxw&AVIVn>dS!zW&o0mB|
zlaXyI1Y^~<j%;h29#wi(-*x?noek1T4q<l+f{F6X@qru^4#zCli=;CdFO$xCo|la{
z8OQOQi0%B9_p8v8TU{&KEBWGbA%q0v;kv{aXQyIpU2r0YOoO(9y0%Ay%1$43eYZQN
jk3(RW=YGe`l<GTvy8AmmBw>ub_M!dQgnyG@R=N8I#blxs

-- 
2.30.2