Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-16 21:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

BlenderBIM fix Git error on simple merge (#3096)

Browse Source 
Running git commit after a simple merge (that hasn't required conflict
resolution) is a noop, but generates an annoying message anyway.
This commit is contained in:
Bruno Postle
2023-06-07 22:50:20 +01:00
parent 1eb1ba604e
commit 6c45936118
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/tool/ifcgit.py
+10 -4
View File
@@ -373,6 +373,11 @@ class IfcGit:
config_writer = IfcGitRepo.repo.config_writer() config_writer = IfcGitRepo.repo.config_writer()
config_writer.set_value(section, "cmd", "ifcmerge $BASE $LOCAL $REMOTE $MERGED") config_writer.set_value(section, "cmd", "ifcmerge $BASE $LOCAL $REMOTE $MERGED")
config_writer.set_value(section, "trustExitCode", True) 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)
@classmethod @classmethod
def config_info_attributes(cls, repo): def config_info_attributes(cls, repo):
@@ -415,6 +420,11 @@ class IfcGit:
operator.report({"ERROR"}, "IFC Merge failed:" + message) operator.report({"ERROR"}, "IFC Merge failed:" + message)
return False return False
else:
if os.name == "nt":
cls.dos2unix(path_ifc)
repo.index.add(path_ifc)
repo.git.commit("--no-edit")
except: except:
operator.report({"ERROR"}, "Unknown IFC Merge failure") operator.report({"ERROR"}, "Unknown IFC Merge failure")
@@ -422,10 +432,6 @@ class IfcGit:
props.display_branch = repo.active_branch.name props.display_branch = repo.active_branch.name
if os.name == "nt":
cls.dos2unix(path_ifc)
repo.index.add(path_ifc)
repo.git.commit("--no-edit")
cls.load_project(path_ifc) cls.load_project(path_ifc)
cls.refresh_revision_list(path_ifc) cls.refresh_revision_list(path_ifc)