This is an automated email from the ASF dual-hosted git repository.

github-merge-queue[bot] pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git

commit 4c982a7a8abba119b326b19456f4ef7fda78f059
Author: Suryaa Charan <[email protected]>
AuthorDate: Wed Oct 7 16:20:29 2026 +0000

    chore: ignore symlinks at the generated proto and node_modules paths (#8887)
    
    ### What changes were proposed in this PR?
    
    Two `.gitignore` patterns end in `/`, which only matches directories:
    
    ```
    amber/src/main/python/proto/
    **/node_modules/
    ```
    
    A symlink at either path isn't ignored. This is easy to hit when you run
    tests in a second worktree and symlink the generated protos or
    `node_modules` from your main checkout instead of regenerating them. A
    `git add -A` then commits the symlink.
    
    That happened to me in #8769: the symlink got committed, and CI's
    `bin/python-proto-gen.sh` failed with `mkdir: cannot create directory
    '.../amber/src/main/python/proto': File exists`, so every job stopped
    before running tests.
    
    This drops the trailing slash on both lines, so files, symlinks and
    directories at those paths are all ignored.
    
    ### Any related issues, documentation, discussions?
    
    Found while working on #8769.
    
    ### How was this PR tested?
    
    In a scratch repo with a symlink at `amber/src/main/python/proto` and at
    `agent-service/node_modules`:
    
    - old patterns: both symlinks show up in `git status` as untracked
    - new patterns: both are ignored
    
    Real directories at those paths are still ignored, since a pattern
    without a trailing slash matches directories too.
    
    ### Was this PR authored or co-authored using generative AI tooling?
    
    Generated-by: Claude Code (Claude Opus 5.5)
    
    Co-authored-by: suryaacharan <[email protected]>
    Co-authored-by: Claude Opus 5.5 <[email protected]>
---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e772fee5a..adb3ef7844 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,7 @@ coverage.xml
 *.pkl
 
 # Regenerated by bin/python-proto-gen.sh.
-amber/src/main/python/proto/
+amber/src/main/python/proto
 
 # Ingoring user generated resources
 user-resources/
@@ -129,7 +129,7 @@ metals.sbt
 values-*.yaml    # Any environment-specific value overrides
 
 # Ignore nested node modules
-**/node_modules/
+**/node_modules
 **/package-lock.json
 .env
 

Reply via email to