chiark / gitweb /
Test suite: unapplied-pq2qc: move into lib as a t- subroutine
[dgit.git] / tests / lib
index 48bc237..0b88362 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -512,6 +512,28 @@ t-apply-diff () {
         | patch -p1 -u
 }
 
+t-gbp-unapplied-pq2qc () {
+       # does `gbp pq export' (leaving us on BRANCH (eg "quilt-tip"))
+       # commits the resulting debian/patches on  qc/BRANCH
+       # goes back to patch-queue/BRANCH
+       # qc/BRANCH is not fast-forwarding
+
+       gbp pq export
+
+       branch=`git symbolic-ref HEAD`
+       branch=${branch#refs/heads/}
+
+       case "$branch" in
+       */*) fail "unexpected branch $branch" ;;
+       esac
+
+       git branch -f qc/$branch
+       git checkout qc/$branch
+       git add debian/patches
+       git commit -m 'Commit patch queue'
+       git checkout patch-queue/$branch
+}
+
 t-commit () {
        local msg=$1
        v=${2-1.$revision}