X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=99bd51a5e73bda417b13066158d838e85fbe291d;hb=29302373129946046c6b461103d12f6b6bf9f908;hp=3662282d9bf7ea33c7bb025e3b20da3528de5c50;hpb=93466233a49a2492b37884d60c23f6e6668e5543;p=dgit.git

diff --git a/dgit b/dgit
index 3662282d..99bd51a5 100755
--- a/dgit
+++ b/dgit
@@ -5400,6 +5400,8 @@ sub quiltify_splitbrain ($$$$$$$) {
     local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
     local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
+    quiltify_splitbrain_needed();
+
     my $fulldiffhint = sub {
 	my ($x,$y) = @_;
 	my $cmd = "git diff $x $y -- :/ ':!debian'";
@@ -5430,7 +5432,6 @@ END
     }
     if ($quilt_mode =~ m/gbp|unapplied/ &&
 	($diffbits->{O2A} & 01)) { # some patches
-	quiltify_splitbrain_needed();
 	progress __ "dgit view: creating patches-applied version using gbp pq";
 	runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
 	# gbp pq import creates a fresh branch; push back to dgit-view
@@ -5447,7 +5448,6 @@ END
     }
     if (($diffbits->{O2H} & 02) && # user has modified .gitignore
 	!($diffbits->{O2A} & 02)) { # patches do not change .gitignore
-	quiltify_splitbrain_needed();
 	progress __
 	    "dgit view: creating patch to represent .gitignore changes";
         ensuredir "debian/patches";