Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
with:
environment-file: dev-environment.yml
cache-environment: true
create-args: lcov
create-args: lcov<2

- name: Configure CMake
run: |
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
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: v22.1.8
rev: v23.1.0
hooks:
- id: clang-format
args: [--style=file]
exclude_types: [javascript,json]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.16.2
rev: v0.16.6
hooks:
- id: ruff-check
args: [--fix]
Expand Down
2 changes: 1 addition & 1 deletion src/utils/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const std::map<git_status_t, status_messages>& get_status_msg_map()
{GIT_STATUS_WT_UNREADABLE, {"", ""}},
{GIT_STATUS_IGNORED, {"!! ", ""}},
{GIT_STATUS_CONFLICTED, {"AA ", "\tboth added: "}},
};
};
return status_msg_map;
}

Expand Down
2 changes: 1 addition & 1 deletion src/utils/common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct status_messages

status_messages get_status_msg(git_status_t);

using stream_colour_fn = std::ostream& (*) (std::ostream&);
using stream_colour_fn = std::ostream& (*)(std::ostream&);

std::string read_file(const std::string& path);

Expand Down
6 changes: 3 additions & 3 deletions src/wasm/stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ EM_JS(
}
catch (err)
{
// Store error for later retrieval
// clang-format off
// Store error for later retrieval
Module["git2cpp_js_error"] = { name: err.name ?? "", message : err.message ?? "" };
// clang-format on
(err.name == "TimeoutError" ? console.warn : console.error)(err);
Expand Down Expand Up @@ -193,8 +193,8 @@ EM_JS(

if (first_read)
{
// Caller must delete the returned status_text and response_headers.
// clang-format off
// Caller must delete the returned status_text and response_headers.
setValue(status, xhr.status, 'i32*');
setValue(status_text, stringToNewUTF8(xhr.statusText ?? ""), 'i8**');
setValue(total_bytes, byte_length, 'i64*');
Expand All @@ -212,8 +212,8 @@ EM_JS(
}
catch (err)
{
// Store error for later retrieval
// clang-format off
// Store error for later retrieval
Module["git2cpp_js_error"] = { name: err.name ?? "", message : err.message ?? "" };
// clang-format on
(err.name == "TimeoutError" ? console.warn : console.error)(err);
Expand Down