git-debrebase: merge: New record-resolved-merge subcommand, WIP

[dgit.git] / tests / tests / overwrite-splitbrains

diff --git a/tests/tests/overwrite-splitbrains b/tests/tests/overwrite-splitbrains
index c0c7470d9d39c41320d6e46cac7124f7589e4110..06d1a987159dded6c3df000c1e1f197ff7164679 100755 (executable)
--- a/tests/tests/overwrite-splitbrains
+++ b/tests/tests/overwrite-splitbrains
@@ -7,21 +7,21 @@ t-tstunt-parsechangelog
 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-refs-same-start
 t-ref-head
 
-t-expect-fail 'check failed (maybe --overwrite is needed' \
-t-dgit --quilt=gbp push
+t-expect-fail 'maybe --overwrite is needed' \
+t-dgit --quilt=gbp --dgit-view-save=split.p push
 
 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
 
-echo ok.
+t-ok