chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Manpage: add dgit-maint-merge.7.pod
[dgit.git]
/
tests
/
tests
/
fetch-localgitonly
diff --git
a/tests/tests/fetch-localgitonly
b/tests/tests/fetch-localgitonly
index 1177ed63500ce8cf052cf5071ea8b5f9998b6b13..b0ade5f2991e534efdd2b476e475d9b96c07272d 100755
(executable)
--- 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