Skip to content

fix: Ignore any (1-2 digit) number of incremental save versions #2

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

Open
Nylme wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Ignore any (1-2 digit) number of incremental save versions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion bl_git/diffs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ class DiffsMixin:
def _filter_changes(self, changes):
IGNORE_PATTERNS = [
"*.blend",
"*.blend1",
# Blender(by default) allows up to 32 incremental versions
"*.blend[0-9]",
"*.blend[0-9][0-9]",
CANONICAL_MANIFEST_REL,
]

Expand Down
2 changes: 1 addition & 1 deletion bl_git/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ def _gitblocks_dirty_paths(self, dirty_paths):
return gitblocks_paths

def _blocking_dirty_paths(self, dirty_paths):
allowed_patterns = ["*.blend", "*.blend1"]
allowed_patterns = ["*.blend", "*.blend[0-9]", "*.blend[0-9][0-9]"] # Blender(by default) allows up to 32 incremental versions
gitblocks_paths = self._gitblocks_dirty_paths(dirty_paths)
blocking = set()
for path in dirty_paths or set():
Expand Down