X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=251143e3fe89b2828379978c92f7905de70a3a3e;hb=bb2d12326a03e8925104937569fdab0ebdc34ccb;hp=9ea5af51bcacbbe1f885d0535bdb02339183b6f3;hpb=626c5a5851ebabb54e01e3fe3e15b3971f62555b;p=dgit.git diff --git a/tests/lib-gdr b/tests/lib-gdr index 9ea5af51..251143e3 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -3,6 +3,8 @@ : ${GDR_TEST_DEBUG=-D} export GDR_TEST_DEBUG +t-tstunt debchange + t-git-debrebase () { local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase} : ' @@ -21,6 +23,12 @@ t-gdr-good () { # stitched # pushed + case $state in + pushed*) + t-gdr-made-patches + ;; + esac + git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches' LC_MESSAGES=C t-git-debrebase status >../status.check @@ -345,6 +353,10 @@ t-gdr-gbp-import-core () { git add debian git commit -m "an upstream retcon ($0)" git tag v1.0 +} + +t-gdr-gbp-import-core-with-queue () { + t-gdr-gbp-import-core : 'fake up that our quilt-tip was descended from upstream' git checkout quilt-tip @@ -360,3 +372,8 @@ t-gdr-gbp-import-core () { git branch -D master git branch -m quilt-tip master } + +t-gdr-made-patches () { + git log -n1 --'pretty=format:%B' \ + | egrep '^\[git-debrebase' +}