X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-badcommit-fixup;h=c119c4acae99f65f8e7e626b0a7960fb54bcb1fd;hp=32d5f0b1d3178004b05b4dbf25f92ee6b801b089;hb=3894237fb0ac3d9c9d3857ae2dfd628d331c0f49;hpb=30285c0d7edaeb05605ff620f8d8d6d09d91f5c2

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index 32d5f0b1..c119c4ac 100755
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -6,12 +6,27 @@
 #   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;
 use IPC::Open2;
 use Data::Dumper;
 
+our $our_version = 'UNRELEASED'; ###substituted###
+
 my $real;
 
 foreach my $a (@ARGV) {
@@ -180,9 +195,11 @@ sub edit_rewrite_map ($) {
 	runcmd qw(git add map);
     }
 
-    runcmd qw(git commit -q), 
-	qw(-m), 'dgit-badcommit-fixup',
-	qw(map);
+    runcmd qw(git commit -q), qw(-m), <<END, qw(map);
+dgit-badcommit-fixup
+
+[dgit-badcommit-fixup $our_version]
+END
 
     $!=0; $?=0;
     my $new = `git rev-parse HEAD`;
@@ -213,6 +230,7 @@ foreach my $rline (split /\n/, $refs) {
 	$org_rewrite_map = $obj;
 	continue;
     }
+    next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
     my $rewrite;
     if ($type eq 'commit') {
 	$rewrite = rewrite_commit($obj);