Commit the adding of the patches local module and the first patch file conversion together

This makes sense since a module with no build steps is not considered valid.

Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>

Author: jakub-nt

cfbs/commands.py

@@ -1418,15 +1418,24 @@ def cfbs_convert_git_commit(
             if not patches_module_present:
                 print("Adding patches local module...")
                 mkdir(patches_dir)
-                add_command(
+
+                config = CFBSConfig.get_instance()
+                config.add_command(
                     [patches_module],
                     added_by="cfbs convert",
                     explicit_build_steps=["patch " + patch_filename],
                 )
                 # `explicit_build_steps=[]` would fail validation
-                # TODO: rewrite this to temporarily avoid validation to fix the poor Git history for the first file converted to a patch file
+                config.save()
+
+                try:
+                    cfbs_convert_git_commit(
+                        "Added patches local module, converted './%s' into a .patch file"
+                        % modified_file
+                    )
+                except:
+                    log.warning("Git commit failed, continuing without committing...")
 
-                # no need to `cfbs_convert_git_commit` here, the `add_command` will Git commit the added patches local module
                 patches_module_present = True
             else:
                 config = CFBSConfig.get_instance()