From 9b039f99c357b36cf3c0b68806d3a729390fad78 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Tue, 7 Feb 2012 13:27:25 -0500
Subject: Fix parameter mistake from last patch

Pass all the necessary fields to merge_default_fields_from_dict().
---
 git-bz | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-bz b/git-bz
index 4604c82..462df46 100755
--- a/git-bz
+++ b/git-bz
@@ -386,13 +386,13 @@ def get_default_fields(tracker):
 
     default_fields = {}
 
-    merge_default_fields_from_dict(config)
+    merge_default_fields_from_dict(default_fields, config)
 
     # bz.default-* options specified in 'git config' have higher precedence
     # than per-tracker options. We expect them to be set locally by the
     # user for a particular git repository.
 
-    merge_default_fields_from_dict(git_config)
+    merge_default_fields_from_dict(default_fields, git_config)
 
     return default_fields
 
-- 
cgit