From: Ian Jackson Date: Sun, 14 Aug 2016 17:28:10 +0000 (+0100) Subject: Test suite: Remove refs/remotes/dgit/dgit/sid from pari-extra worktree X-Git-Tag: archive/debian/2.0~203 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=80ffc69e9d5cc652a611e84df5d11d80d8995ff6 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 --- 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 81a6a54a..62efeb92 100644 Binary files a/tests/worktrees/pari-extra_3-1.tar and b/tests/worktrees/pari-extra_3-1.tar differ