This is an automated email from the ASF dual-hosted git repository.
dheerajturaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 39ea27cb778 Ignore the magpie snapshot symlink in git worktrees
(#71727)
39ea27cb778 is described below
commit 39ea27cb778c06ad9d7952de55f8a98174643939
Author: Jarek Potiuk <[email protected]>
AuthorDate: Mon Aug 17 20:04:16 2026 +0200
Ignore the magpie snapshot symlink in git worktrees (#71727)
The snapshot is ignored by a directory-only pattern, but only the
main checkout actually has a directory there. /magpie-setup
worktree-init deliberately makes .apache-magpie a symlink to the
main checkout's snapshot so every worktree shares one framework
state, and a trailing-slash pattern never matches a symlink.
The result is that .apache-magpie shows up as untracked in every
worktree, which is noise in git status and one careless "git add -A"
away from committing a machine-local absolute-path symlink.
Dropping the trailing slash matches the directory, its contents, and
the symlink, so the main checkout is unaffected.
---
.gitignore | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index bc988309f83..84c96c1be71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -312,8 +312,12 @@ dev/registry/modules.json
dev/registry/providers.json
# apache-magpie — gitignored snapshot of the framework, refreshed
-# by /magpie-setup upgrade. Build artefact, not source.
-/.apache-magpie/
+# by /magpie-setup upgrade. Build artefact, not source. No trailing
+# slash: in the main checkout this is a directory, but
+# /magpie-setup worktree-init makes it a symlink to the main's
+# snapshot, and a directory-only pattern would leave every worktree
+# showing it as untracked.
+/.apache-magpie
# Per-machine local-pin file. Records what THIS machine fetched and
# when. Compared against the committed .apache-magpie.lock to
