git-env 0.4.0__tar.gz → 0.5.0__tar.gz

{git_env-0.4.0 → git_env-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-env
-Version: 0.4.0
+Version: 0.5.0
 Summary: Sync environment files across linked git worktrees
 Author: Alex Ward
 Author-email: Alex Ward <alxwrd@googlemail.com>

{git_env-0.4.0 → git_env-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "git-env"
-version = "0.4.0"
+version = "0.5.0"
 description = "Sync environment files across linked git worktrees"
 readme = "README.md"
 authors = [

{git_env-0.4.0 → git_env-0.5.0}/src/git_env/repo.py

@@ -91,7 +91,7 @@ def detect_repository(cwd: Path | None = None) -> Repository:
         _git("rev-parse", "--path-format=absolute", "--show-toplevel", cwd=cwd).out
     ).resolve()
 
-    _check_pwd_within_worktree(worktree_root)
+    _check_pwd_within_worktree(cwd)
 
     return Repository(
         git_dir=git_dir.resolve(),
@@ -101,11 +101,11 @@ def detect_repository(cwd: Path | None = None) -> Repository:
     )
 
 
-def _check_pwd_within_worktree(worktree_root: Path) -> None:
+def _check_pwd_within_worktree(cwd: Path) -> None:
     """Paranoid check (spec: "Safety rails") that the shell-reported `$PWD`
-    is actually inside the worktree we just resolved. Catches weird
-    invocations (e.g. a symlinked directory pointing somewhere else) where
-    the shell's notion of cwd has diverged from the real one.
+    is actually the directory we resolved everything else from. Catches
+    weird invocations (e.g. a symlinked directory pointing somewhere else)
+    where the shell's notion of cwd has diverged from the real one.
 
     Skipped if `$PWD` isn't set, since not every caller sets it.
     """
@@ -113,10 +113,8 @@ def _check_pwd_within_worktree(worktree_root: Path) -> None:
     if not pwd:
         return
     resolved_pwd = Path(pwd).resolve()
-    if resolved_pwd != worktree_root and worktree_root not in resolved_pwd.parents:
-        raise RepoError(
-            f"$PWD ({pwd}) is not within the current worktree at {worktree_root}"
-        )
+    if resolved_pwd != cwd:
+        raise RepoError(f"$PWD ({pwd}) is not within the current worktree at {cwd}")
 
 
 def check_primary_clean(

{git_env-0.4.0 → git_env-0.5.0}/src/git_env/sync.py

@@ -116,6 +116,22 @@ def _atomic_copy(src: Path, dest: Path) -> None:
         raise SyncIOError(f"failed to copy {src} -> {dest}: {exc}") from exc
 
 
+def _exclude_can_ever_match(config: SyncConfig) -> bool:
+    """Whether any filename could possibly satisfy both `config.patterns` and
+    `config.exclude` (both are fnmatch globs).
+
+    Exclude entries are almost always literal filenames (e.g. ".env.example"),
+    so testing each one against every include pattern is a cheap, correct
+    way to rule out the common case (e.g. patterns=(".env",) can never match
+    ".env.example") without walking the filesystem to find out.
+    """
+    return any(
+        fnmatch.fnmatch(exclude, pattern)
+        for pattern in config.patterns
+        for exclude in config.exclude
+    )
+
+
 def _cleanup_excluded_in_linked(
     worktree_root: Path,
     config: SyncConfig,
@@ -129,6 +145,9 @@ def _cleanup_excluded_in_linked(
     Excluded patterns are for committed templates (e.g. .env.example) that git
     checks out into linked worktrees but that sync should never treat as env files.
     """
+    if not _exclude_can_ever_match(config):
+        return 0
+
     root = worktree_root
     search_root = (root / path) if path else root
     if not search_root.is_dir():