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-debpush: Check upstream source is identical in the upstream tag
[dgit.git]
/
tests
/
tests
/
tagupl
diff --git
a/tests/tests/tagupl
b/tests/tests/tagupl
index 09ca53a8c542e36576ac74cd93f9488b7ff05373..9d3e45a1c177700e7674156d7256d46e1cd45406 100755
(executable)
--- a/
tests/tests/tagupl
+++ b/
tests/tests/tagupl
@@
-23,10
+23,19
@@
git tag $upstreamtag
git checkout -B master quilt-tip-2
git checkout -B master quilt-tip-2
+echo foo >bar
+git add bar
+git commit -m"corrupt the upstream source to test upstream-nonidentical check"
+
t-tagupl-settings
tagname=test-dummy/$v
t-tagupl-settings
tagname=test-dummy/$v
+t-expect-fail "the upstream source in tag $upstreamtag is not identical to the upstream source in refs/heads/master" \
+t-tagupl-test --quilt=gbp --upstream=$upstreamtag
+
+git reset --hard HEAD~1
+
t-expect-fail "upstream tag $upstreamtag is not an ancestor of refs/heads/master" \
t-tagupl-test --quilt=gbp --upstream=$upstreamtag
t-expect-fail "upstream tag $upstreamtag is not an ancestor of refs/heads/master" \
t-tagupl-test --quilt=gbp --upstream=$upstreamtag