chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: test suite: do not dgit pull (sets a bad example)
[dgit.git]
/
tests
/
tests
/
gdr-import-dgit
diff --git
a/tests/tests/gdr-import-dgit
b/tests/tests/gdr-import-dgit
index 0522818bb6f17ea89f43cc0cab96b22d34330e4e..a9a318779877eac49c1e10a785856309cf70907d 100755
(executable)
--- a/
tests/tests/gdr-import-dgit
+++ b/
tests/tests/gdr-import-dgit
@@
-32,7
+32,8
@@
t-archive-process-incoming sid
cd $p
git checkout master
-t-dgit pull
+t-dgit fetch
+git merge --ff-only dgit/dgit/sid
git diff --exit-code nmu