Skip to content

Commit

Permalink
Patch dependabot config + codecov version
Browse files Browse the repository at this point in the history
  • Loading branch information
PawelLipski committed Feb 19, 2024
1 parent fd0ff63 commit 1af86ab
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ executors:
resource_class: windows.medium

orbs:
codecov: codecov/codecov@4.0.0
codecov: codecov/codecov@4.0.1

jobs:
"general checks":
Expand Down
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ updates:
reviewers:
- PawelLipski
target-branch: develop
groups:
deps:
patterns:
- "*"
4 changes: 2 additions & 2 deletions git_machete/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ def __fork_point_and_containing_branch_pairs(self,
# is_ancestor(upstream, FP(branch)), but it's still possible in
# case reflog of upstream is incomplete for whatever reason.
debug(
f"{upstream} is an ancestor of its upstream {branch}, "
f"{upstream} is an ancestor of {branch}, "
f"but the inferred fork point commit {computed_fork_point} is NOT a descendant of {upstream}; "
f"falling back to {upstream} as fork point")
return upstream_hash, []
Expand All @@ -1362,7 +1362,7 @@ def __fork_point_and_containing_branch_pairs(self,
common_ancestor_hash = self.__git.get_merge_base(upstream.full_name(), branch.full_name())
assert common_ancestor_hash is not None
debug(
f"{upstream} is NOT an ancestor of its upstream {branch}, "
f"{upstream} is NOT an ancestor of {branch}, "
f"but the inferred fork point commit {computed_fork_point} is an ancestor of {upstream}; "
f"falling back to the common ancestor of {branch} and {upstream} (commit {common_ancestor_hash}) as fork point")
return common_ancestor_hash, []
Expand Down

0 comments on commit 1af86ab

Please sign in to comment.