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 scmrepo/fs.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def _open(
obj.size = bytesio_len(obj)
return obj
except KeyError as exc:
msg = os.strerror(errno.ENOENT) + f"in branch '{self.rev}'"
msg = os.strerror(errno.ENOENT) + f" in branch '{self.rev}'"
raise FileNotFoundError(errno.ENOENT, msg, path) from exc
except IsADirectoryError as exc:
raise IsADirectoryError(
Expand Down
2 changes: 1 addition & 1 deletion scmrepo/git/backend/pygit2.py
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ def merge(
return str(obj.id)

if ff_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY:
raise SCMError("Cannot fast-forward HEAD to '{rev}'")
raise SCMError(f"Cannot fast-forward HEAD to '{rev}'")

if commit:
if not msg:
Expand Down