summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2012-02-07 13:27:25 -0500
committerOwen W. Taylor <otaylor@fishsoup.net>2012-02-07 13:28:09 -0500
commit9b039f99c357b36cf3c0b68806d3a729390fad78 (patch)
treea6611490c7715cc2a87ea083ae621207027d2fbf
parent75b069955f2068175db3f018d7778c192b533a01 (diff)
Fix parameter mistake from last patch
Pass all the necessary fields to merge_default_fields_from_dict().
-rwxr-xr-xgit-bz4
1 files 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