X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=6a035d6a2fc8800c4c723ffa3620594870d9c558;hb=676ab414d093c6eb3e1eacfd9220a0d9b1c88b97;hp=d720f5aff013047d3b271c444ed7d84aedb510ae;hpb=828e8d1b2a321aaa34da7e7cb5963b18dc2c3b7a;p=dgit.git

diff --git a/dgit b/dgit
index d720f5af..6a035d6a 100755
--- a/dgit
+++ b/dgit
@@ -5525,16 +5525,6 @@ END
 [dgit ($our_version) update-gitignore-quilt-fixup]
 ENDU
     }
-
-    my $dgitview = git_rev_parse 'HEAD';
-
-    changedir $maindir;
-    reflog_cache_insert "refs/$splitbraincache", $cachekey, $dgitview;
-
-    changedir "$playground/work";
-
-    my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
-    progress f_ "dgit view: created (%s)", $saved;
 }
 
 sub quiltify ($$$$) {
@@ -5867,6 +5857,19 @@ sub build_maybe_quilt_fixup () {
 			      $splitbrain_cachekey);
     }
 
+    if ($do_split_brain) {
+	my $dgitview = git_rev_parse 'HEAD';
+
+	changedir $maindir;
+	reflog_cache_insert "refs/$splitbraincache",
+	    $splitbrain_cachekey, $dgitview;
+
+	changedir "$playground/work";
+
+	my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
+	progress f_ "dgit view: created (%s)", $saved;
+    }
+
     changedir $maindir;
     runcmd_ordryrun_local
         @git, qw(pull --ff-only -q), "$playground/work", qw(master);
@@ -7414,10 +7417,10 @@ sub parseopts () {
 	    } elsif (m/^--delayed=(\d+)$/s) {
 		push @ropts, $_;
 		push @dput, $_;
-	    } elsif (my ($k,$v) =
-		     m/^--save-(dgit-view)=(.+)$/s ||
+	    } elsif (m/^--save-(dgit-view)=(.+)$/s ||
 		     m/^--(dgit-view)-save=(.+)$/s
 		     ) {
+		my ($k,$v) = ($1,$2);
 		push @ropts, $_;
 		$v =~ s#^(?!refs/)#refs/heads/#;
 		$internal_object_save{$k} = $v;