FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[pre-commit.ci] pre-commit autoupdate by pre-commit-ci[bot] · Pull Request #122 · QuantStack/git2cpp · GitHub

  1. QuantStack
  2. git2cpp

Repository navigation

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianthomas23 merged 2 commits into from
Mar 17, 2026
Conversation 1 Commits 2 Checks 5 Files changed
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fa5c3e
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Mar 16, 2026
a0b3b2a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 16, 2026
File filter

Filter by extension

Filter by extension .cpp  (1) .yaml  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 4 additions & 3 deletions src/subcommand/merge_subcommand.cpp
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Loading
Back | FazBrowse Home | New Git URL