[pre-commit.ci] pre-commit autoupdate (#122)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/mirrors-clang-format: v21.1.2 → v22.1.1](pre-commit/mirrors-clang-format@v21.1.2...v22.1.1)
- [github.com/astral-sh/ruff-pre-commit: v0.14.0 → v0.15.6](astral-sh/ruff-pre-commit@v0.14.0...v0.15.6)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -17,14 +17,14 @@ repos:
         args: ['--py312-plus']
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.2
+    rev: v22.1.1
     hooks:
       - id: clang-format
         args: [--style=file]
         exclude_types: [javascript,json]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.0
+    rev: v0.15.6
     hooks:
       - id: ruff-check
         args: [--fix]

src/subcommand/merge_subcommand.cpp

@@ -324,9 +324,10 @@ void merge_subcommand::run()
         std::cout << "Already up-to-date" << std::endl;
         return;
     }
-    else if (analysis & GIT_MERGE_ANALYSIS_UNBORN
-             || (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
-                 && !(preference & GIT_MERGE_PREFERENCE_NO_FASTFORWARD)))
+    else if (
+        analysis & GIT_MERGE_ANALYSIS_UNBORN
+        || (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD && !(preference & GIT_MERGE_PREFERENCE_NO_FASTFORWARD))
+    )
     {
         if (analysis & GIT_MERGE_ANALYSIS_UNBORN)
         {