summaryrefslogtreecommitdiff
path: root/tests/tests/quilt-splitbrains
diff options
context:
space:
mode:
Diffstat (limited to 'tests/tests/quilt-splitbrains')
-rwxr-xr-xtests/tests/quilt-splitbrains9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index f8d8091..4c683c0 100755
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -26,7 +26,9 @@ want-success () {
t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
- t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
+ $want_success_pre_push_hook
+
+ t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push-built
t-$qmode-pushed-good $suite
}
@@ -77,7 +79,10 @@ t-dgit -wgf --quilt=gbp build-source
t-expect-fail 'This might be a patches-unapplied branch' \
t-dgit -wgf build-source
+# Check that push-built regenerates the cache if necessary
+want_success_pre_push_hook='git update-ref -d refs/dgit-intern/quilt-cache'
want-success unapplied -wgf
+want_success_pre_push_hook=''
echo "===== making fully-applied tree suitable for --quilt-check ====="
@@ -101,7 +106,7 @@ t-dgit --quilt=unapplied build-source
t-dgit --quilt=nofix build-source
t-refs-same-start
t-ref-head
-t-dgit --quilt=nofix push
+t-dgit --quilt=nofix push-built
t-pushed-good-core