From 1bdb8dcb25eb15fd197f6466c15105dccf11c52b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Jan 2017 18:09:27 +0000
Subject: dgit-badcommit-fixup: Now seems to work

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit-badcommit-fixup | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'dgit-badcommit-fixup')

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index 98720e5..72c719b 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];
     }
 
-- 
cgit v1.2.3