Test suite: unapplied-pq2qc: move into lib as a t- subroutine

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 7f459aa2cf2f258fc124de9fce0ceeb342ea1ddc..0b8836266fbfc1746a16a09a2d71c10205a19a06 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -134,7 +134,7 @@ t-untar () {
        local tarfile=$1.tar
        local edittree=$1.edit
        if test -d "$edittree"; then
        local tarfile=$1.tar
        local edittree=$1.edit
        if test -d "$edittree"; then

-               cp -al "$edittree"/* .
+               cp -a "$edittree"/* .

        else
                tar xf "$tarfile"
        fi
        else
                tar xf "$tarfile"
        fi


@@ -512,6 +512,28 @@ t-apply-diff () {
         | patch -p1 -u
 }
 
         | 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}
 t-commit () {
        local msg=$1
        v=${2-1.$revision}