chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split brain: Test suite: quilt-gbp: Test 2nd push (ie, test pseudomerge)
[dgit.git]
/
tests
/
tests
/
quilt-gbp
diff --git
a/tests/tests/quilt-gbp
b/tests/tests/quilt-gbp
index d3624e9ee6f5183350b10a586c3beab2724513b1..2dc9b420e3bd3ab47ddb2bc46744661e268fa027 100755
(executable)
--- a/
tests/tests/quilt-gbp
+++ b/
tests/tests/quilt-gbp
@@
-2,6
+2,10
@@
set -e
. tests/lib
set -e
. tests/lib
+t-tstunt-parsechangelog
+
+t-newtag
+
t-gbp-example-prep
t-expect-fail 'quilt fixup cannot be linear' \
t-gbp-example-prep
t-expect-fail 'quilt fixup cannot be linear' \
@@
-23,24
+27,25
@@
t-dgit --quilt=gbp --clean=git build-source
t-expect-fail 'specifies a different tree to your HEAD commit' \
t-dgit push
t-expect-fail 'specifies a different tree to your HEAD commit' \
t-dgit push
-exit 0
+test-push () {
+ t-refs-same-start
+ t-ref-head
-===
+ t-dgit --quilt=gbp push
-want to
+ t-gbp-pushed-good
+}
- do push
- t-pushed-good
- check that
- - we didn't update caller's branch
+test-push
- do fetch
- check that this didn't update dgit remote ref
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
- check that Dgit hash in dsc refers to tree identical
- to dpkg-source -x
+t-commit 'Check psuedomerge' 1.0-3
-
check that that tre
e
- - has patches applied (reuse rules build magic)
- - has .gitignore edited
+
t-dgit --quilt=gbp --clean=git build-sourc
e
+
+test-push
+exit 0