chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: checkout: Check we end up on the right branch each time
[dgit.git]
/
tests
/
tests
/
fetch-localgitonly
diff --git
a/tests/tests/fetch-localgitonly
b/tests/tests/fetch-localgitonly
index 1177ed63500ce8cf052cf5071ea8b5f9998b6b13..7d603b2704f73cf0b1a7909abdd812dadb6c6e51 100755
(executable)
--- 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`
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
t-dgit pull
t-cloned-fetched-good
t-has-ancestor $old
-echo ok.
+t-ok