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 f0a1e76cfad8f7fba10dfe48f9221c6c6730b7d8..dd052fe106d95d2fd159f739b2ea14274988f67f 100755 (executable)
--- 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 "$!";