From 567ad3bf635aaa29315a60ac8154d5ff865ff0c8 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sat, 10 Jun 2023 10:07:17 +0100 Subject: [PATCH] BlenderBIM fix warning writing .git/config (#3096) --- src/blenderbim/blenderbim/tool/ifcgit.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/blenderbim/blenderbim/tool/ifcgit.py b/src/blenderbim/blenderbim/tool/ifcgit.py index 654e52f832..0e809e5a18 100644 --- a/src/blenderbim/blenderbim/tool/ifcgit.py +++ b/src/blenderbim/blenderbim/tool/ifcgit.py @@ -368,14 +368,13 @@ class IfcGit: @classmethod def config_ifcmerge(cls): config_reader = IfcGitRepo.repo.config_reader() + config_writer = IfcGitRepo.repo.config_writer() section = 'mergetool "ifcmerge"' if not config_reader.has_section(section): - config_writer = IfcGitRepo.repo.config_writer() config_writer.set_value(section, "cmd", "ifcmerge $BASE $LOCAL $REMOTE $MERGED") config_writer.set_value(section, "trustExitCode", True) section = 'mergetool "ifcmerge-forward"' if not config_reader.has_section(section): - config_writer = IfcGitRepo.repo.config_writer() config_writer.set_value(section, "cmd", "ifcmerge $BASE $REMOTE $LOCAL $MERGED") config_writer.set_value(section, "trustExitCode", True)