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: gdr-subcommands: honour new $xopts
[dgit.git]
/
tests
/
tests
/
overwrite-splitbrains
diff --git
a/tests/tests/overwrite-splitbrains
b/tests/tests/overwrite-splitbrains
index c0c7470d9d39c41320d6e46cac7124f7589e4110..0ef03f65369b216df446b46a64eadf467ed17ed0 100755
(executable)
--- a/
tests/tests/overwrite-splitbrains
+++ b/
tests/tests/overwrite-splitbrains
@@
-7,7
+7,7
@@
t-tstunt-parsechangelog
t-gbp-example-prep-no-ff
t-newtag
t-gbp-example-prep-no-ff
t-newtag
-t-dgit --quilt=gbp build-source
+t-dgit --quilt=gbp
--dgit-view-save=split.b
build-source
t-dgit fetch
t-dgit fetch
@@
-15,13
+15,13
@@
t-refs-same-start
t-ref-head
t-expect-fail 'check failed (maybe --overwrite is needed' \
t-ref-head
t-expect-fail 'check failed (maybe --overwrite is needed' \
-t-dgit --quilt=gbp push
+t-dgit --quilt=gbp
--dgit-view-save=split.p
push
t-refs-same-start
t-ref-head
t-refs-same-start
t-ref-head
-t-dgit --quilt=gbp --overwrite push
+t-dgit --quilt=gbp --
dgit-view-save=split.p --
overwrite push
t-gbp-pushed-good
t-gbp-pushed-good
-echo ok.
+t-ok