From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Jan 2017 18:09:27 +0000 (+0000)
Subject: dgit-badcommit-fixup: Now seems to work
X-Git-Tag: archive/debian/2.16~8
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1bdb8dcb25eb15fd197f6466c15105dccf11c52b

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 98720e57..72c719b1 100755
--- 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];
     }