diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-06-19 16:16:12 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 16:47:48 +0100 |
commit | d3606ff36cbf24f80152c5848fefee0c62686486 (patch) | |
tree | 6f2656a9fdd56179508fe28788df5f91c8a48523 /tests/lib | |
parent | 041c3de0db5da816fcbe5b8ac560946a058570bd (diff) |
Test suite: unapplied-pq2qc: move into lib as a t- subroutine
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -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} |