From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Aug 2018 11:33:10 +0000 (+0100)
Subject: git-debrebase: Break out gbp_pq_export (nfc)
X-Git-Tag: archive/debian/6.7~162
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=cf4848f57b34bc2918526e8195c9ec730b11b18a

git-debrebase: Break out gbp_pq_export (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 0d3162fd..f56ec32e 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -310,6 +310,22 @@ sub any_snags () {
     return $snags_forced || $snags_tripped;
 }
 
+sub gbp_pq_export ($$$) {
+    my ($bname, $base, $tip) = @_;
+    # must be run in a workarea.  $bname and patch-queue/$bname
+    # ought not to exist.  Leaves you on patch-queue/$bname with
+    # the patches staged but not committed.
+    runcmd @git, qw(checkout -q -b), $bname, $base;
+    runcmd @git, qw(checkout -q -b), "patch-queue/$bname", $tip;
+    my @gbp_cmd = (qw(gbp pq export));
+    my $r = system shell_cmd 'exec >../gbp-pq-err 2>&1', @gbp_cmd;
+    if ($r) {
+	{ local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
+	failedcmd @gbp_cmd;
+    }
+    runcmd @git, qw(add -f debian/patches);
+}
+
 # classify returns an info hash like this
 #   CommitId => $objid
 #   Hdr => # commit headers, including 1 final newline
@@ -1618,15 +1634,7 @@ sub make_patches_staged ($) {
     my ($secret_head, $secret_bw, $last_anchor) = walk $head;
     fresh_workarea();
     in_workarea sub {
-	runcmd @git, qw(checkout -q -b bw), $secret_bw;
-	runcmd @git, qw(checkout -q -b patch-queue/bw), $secret_head;
-	my @gbp_cmd = (qw(gbp pq export));
-	my $r = system shell_cmd 'exec >../gbp-pq-err 2>&1', @gbp_cmd;
-	if ($r) {
-	    { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
-	    failedcmd @gbp_cmd;
-	}
-	runcmd @git, qw(add -f debian/patches);
+	gbp_pq_export 'bw', $secret_bw, $secret_head;
     };
 }