diff options
author | Owen W. Taylor <otaylor@fishsoup.net> | 2012-02-07 13:27:25 -0500 |
---|---|---|
committer | Owen W. Taylor <otaylor@fishsoup.net> | 2012-02-07 13:28:09 -0500 |
commit | 9b039f99c357b36cf3c0b68806d3a729390fad78 (patch) | |
tree | a6611490c7715cc2a87ea083ae621207027d2fbf | |
parent | 75b069955f2068175db3f018d7778c192b533a01 (diff) |
Fix parameter mistake from last patch
Pass all the necessary fields to merge_default_fields_from_dict().
-rwxr-xr-x | git-bz | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |