summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmanuele Aina <emanuele.aina@collabora.com>2015-09-08 15:04:42 +0200
committerMatěj Cepl <mcepl@cepl.eu>2024-02-19 14:04:54 +0100
commit8af852fe07d55bf72c41bc7ba0244bba2ca5777e (patch)
treefd93eef7b1e4eb9304996d313ded10d53ea13dd0
parent38e3eb1f3ca5d23db45d554bd32052375d8d8077 (diff)
downloadgit-bz-8af852fe07d55bf72c41bc7ba0244bba2ca5777e.tar.gz
Fix exception on `git bz file`HEADmasterfishsoup
(Reconstructed from the original commit http://git.fishsoup.net/cgit/git-bz/commit/?id=e17bbae7a2ce454d9f69c32fc40066995d44913d)
-rwxr-xr-xgit-bz2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-bz b/git-bz
index 8bd55f5..f0eca04 100755
--- a/git-bz
+++ b/git-bz
@@ -417,7 +417,7 @@ def get_config(tracker):
add_config_from_string(CONFIG[host], cached_config)
add_config_from_git(host, cached_config)
if tracker != host:
- cached_config.update(get_git_config(tracker))
+ add_config_from_git(tracker, cached_config)
assert cached_config_tracker == tracker