update dolt_merge check

nautobot · Jan 27, 2024 · adcfbbc · adcfbbc
1 parent 56c09cd
commit adcfbbc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/nautobot_version_control/models.py b/nautobot_version_control/models.py
@@ -162,7 +162,10 @@ def merge(self, merge_branch, user=None, squash=False):
                     );"""
                 )
             res = cursor.fetchone()
-            if res[0] == 0 and res[1] == 0:  # magic???
+            # dolt_merge returns a signature that is at the time of this writing:
+            # ws, h.String(), noConflictsOrViolations, fastForwardMerge, str, nil
+            # test the noConflictsOrViolations and fastForwardMerge is good 
+            if res[1] == 0 and res[2] == 0:  # magic???
                 # only commit merged data on success
                 msg = f"""merged "{merge_branch}" into "{self.name}"."""
                 cursor.execute(  # TODO: not safe