From: Ian Jackson Date: Sat, 4 Jun 2016 21:22:41 +0000 (+0100) Subject: Test suite: Provide tests/unapplied-pq2qc X-Git-Tag: archive/debian/2.0~290 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=041c3de0db5da816fcbe5b8ac560946a058570bd;p=dgit.git Test suite: Provide tests/unapplied-pq2qc Utility script for invoking gbp pq. I think I will want to swallow this into a t-* function in tests/lib. --- diff --git a/tests/unapplied-pq2qc b/tests/unapplied-pq2qc new file mode 100755 index 00000000..03b2cdff --- /dev/null +++ b/tests/unapplied-pq2qc @@ -0,0 +1,23 @@ +#!/bin/bash +set -e +fail () { echo >&2 "$0: $*"; exit 1; } + +# 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