From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Jun 2019 19:02:30 +0000 (+0100)
Subject: dgit: Move git chedckout master out of quiltify
X-Git-Tag: archive/debian/9.0~115
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b0e869bfd2247ab7465547d1363254f3d97f6504;p=dgit.git

dgit: Move git chedckout master out of quiltify

This is closer to where it is going to be used, and a bit less
confusing.

No functional change.

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

diff --git a/dgit b/dgit
index f0a1e76c..dd052fe1 100755
--- a/dgit
+++ b/dgit
@@ -5815,8 +5815,6 @@ sub quiltify ($$$$) {
 
 	runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
     }
-
-    runcmd @git, qw(checkout -q master);
 }
 
 sub build_maybe_quilt_fixup () {
@@ -6303,6 +6301,7 @@ END
 
     progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
     quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
+    runcmd @git, qw(checkout -q master);
 
     if (!open P, '>>', ".pc/applied-patches") {
 	$!==&ENOENT or confess "$!";