Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 30, 2023
1 parent 4e3e41e commit 38db2c2
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/scmrepo/git/backend/pygit2.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,7 @@ def _merge_remote_branch(
if on_diverged and on_diverged(lh, rh_rev):
return SyncStatus.SUCCESS
return SyncStatus.DIVERGED
logger.debug(
"Unexpected merge result: %s", pygit2.GIT_MERGE_ANALYSIS_NORMAL
)
logger.debug("Unexpected merge result: %s", pygit2.GIT_MERGE_ANALYSIS_NORMAL)
raise SCMError("Unknown merge analysis result")

def fetch_refspecs(
Expand Down

0 comments on commit 38db2c2

Please sign in to comment.