dgit-badcommit-fixup: Now seems to work

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index 98720e57d6eb2f67bfdf6b644b17a80b456c41e5..72c719b117b5b2d444a4723a4a32238ad9ab39d0 100755 (executable)
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -160,7 +160,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];
     }