From 1401c0a3f01cd614fa7c90f66f79ee0ea126e092 Mon Sep 17 00:00:00 2001
From: Nigel Metheringham <nigel@exim.org>
Date: Sun, 30 Jan 2011 16:27:41 +0000
Subject: [PATCH] Tweaking of close bug code

---
 script/git-to-bugzilla.pl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/script/git-to-bugzilla.pl b/script/git-to-bugzilla.pl
index ef0c870..9fbddba 100755
--- a/script/git-to-bugzilla.pl
+++ b/script/git-to-bugzilla.pl
@@ -43,8 +43,8 @@ sub update_bugzilla {
         $bz->additional_comments( join( "\n", $header, @{ $info->{all} } ) );
     }
 
-    $bz->change_status("fixed")  if ( $set->{action} eq 'fixes' );
-    $bz->change_status("closed") if ( $set->{action} eq 'closes' );
+    $bz->change_status("fixed")  if ( $set->{action} =~ /fixes/ );
+    $bz->change_status("closed") if ( $set->{action} =~ /closes/ );
 
     $bz->commit;
 
@@ -74,7 +74,6 @@ sub find_bugzilla_references {
         }
 
         # remap actions
-        $action = 'closes' if ( $action =~ /^fix/ );
 
         push( @results, { bug => $bugid, action => $action } );
         ##printf( "%s\n\taction = %s bugid = %s\n", $info->{rev}, $action, $bugid );
-- 
2.30.2