dgit-badcommit-fixup: Instructions comment

[dgit.git] / dgit-badcommit-fixup

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index 98720e57d6eb2f67bfdf6b644b17a80b456c41e5..d1bca74dc23f245e2d4b88dec1455df1400bbb55 100755 (executable)
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -6,6 +6,19 @@
 #   dgit-badcommit-fixup --test
 #   dgit-badcommit-fixup --real
 
+# Update procedure, from server operator's point of view:
+#
+# 1. Test in an offline tree that this DTRT
+#
+# 2. Announce a transition time.  Tell everyone that between
+#    the transition time and their next upload, they must
+#    run this script.
+#
+# 3. At the transition time, run this script in every repo.
+#
+# 4. Run the mirror script to push changes, if necessary.
+
+
 use strict;
 
 use POSIX;
@@ -160,7 +173,12 @@ sub edit_rewrite_map ($) {
        close M or die $!;
     }
 
-    foreach my $up (@updates) {
+    foreach my $oldc (keys %memo) {
+       my $newc = $memo{$oldc};
+       next if $oldc eq $newc;
+       $map{$oldc} = $newc;
+    }
+    foreach my $up (@updates) { # catches tags
        $map{ $up->[1] } = $up->[2];
     }
 
@@ -239,11 +257,6 @@ if (!@updates) {
 
 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
 
-if ($real && $bare eq 'false') {
-    print "detaching your HEAD\n" or die $!;
-    runcmd 'git checkout --detach';
-}
-
 for my $up (@updates) {
     my ($ref, $old, $new, $nobackup) = @$up;
     my $otherref = $ref;