diff options
Diffstat (limited to 'tests/tests/quilt-gbp')
| -rwxr-xr-x | tests/tests/quilt-gbp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index e502f6b..e1e53c8 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -22,6 +22,8 @@ t-tstunt-parsechangelog t-gbp-example-prep +git config --global init.defaultBranch trunk + t-expect-fail 'quilt fixup cannot be linear' \ t-dgit build-source @@ -43,7 +45,7 @@ test-push-1 () { } test-push-2 () { - t-dgit --quilt=gbp --dgit-view-save=split.p push + t-dgit --quilt=gbp --dgit-view-save=split.p push-built t-gbp-pushed-good } @@ -53,7 +55,7 @@ test-push-1 t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source t-expect-fail "HEAD specifies a different tree to $p" \ - t-dgit push + t-dgit push-built test-push-2 |