Split brain: Quieten dgit-view checkout

[dgit.git] / dgit

diff --git a/dgit b/dgit
index b22d6ab3f25a386194d08d4449de504dd53d6fe5..1477d1725ac6d3ed09384f2cd0b901173ad890ce 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -200,6 +200,10 @@ sub deliberately_not_fast_forward () {
     }
 }
 
+sub quiltmode_splitbrain () {
+    $quilt_mode =~ m/gbp|dpm|unapplied/;
+}
+
 #---------- remote protocol support, common ----------
 
 # remote push initiator/responder protocol:
@@ -2579,7 +2583,7 @@ sub quiltify_splitbrain ($$$$$$) {
        runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
        # gbp-pq import creates a fresh branch; push back to dgit-view
        runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
-       runcmd @git, qw(checkout dgit-view);
+       runcmd @git, qw(checkout -q dgit-view);
     }
     if (($diffbits->{H2O} & 02) && # user has modified .gitignore
        !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
@@ -3038,7 +3042,7 @@ END
     close $fakedsc or die $!;
 
     my $splitbrain_cachekey;
-    if ($quilt_mode =~ m/gbp|dpm|unapplied/) {
+    if (quiltmode_splitbrain()) {
        # we look in the reflog of dgit-intern/quilt-cache
        # we look for an entry whose message is the key for the cache lookup
        my @cachekey = (qw(dgit), $our_version);
@@ -3173,7 +3177,7 @@ END
     push @failsuggestion, "Maybe you need to specify one of".
         " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
 
-    if ($splitbrain_cachekey) {
+    if (quiltmode_splitbrain()) {
        quiltify_splitbrain($clogp, $unapplied, $headref,
                             $diffbits, \%editedignores,
                            $splitbrain_cachekey);