X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftests%2Ffetch-localgitonly;h=7d603b2704f73cf0b1a7909abdd812dadb6c6e51;hb=468edf05661effb0ef4f4dd1efb2df5a61434259;hp=7937a6f3600e2bdcb7112cd0418dc13229c0081f;hpb=696041cc0947c182a8fcf03c8cd4c37f37cddf1c;p=dgit.git diff --git a/tests/tests/fetch-localgitonly b/tests/tests/fetch-localgitonly index 7937a6f3..7d603b27 100755 --- a/tests/tests/fetch-localgitonly +++ b/tests/tests/fetch-localgitonly @@ -8,9 +8,13 @@ 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 t-has-ancestor $old -echo ok +t-ok