Skip to content

Fix .gitattributes#7602

Open
Growl1234 wants to merge 2 commits into
deepmodeling:developfrom
Growl1234:develop
Open

Fix .gitattributes#7602
Growl1234 wants to merge 2 commits into
deepmodeling:developfrom
Growl1234:develop

Conversation

@Growl1234

@Growl1234 Growl1234 commented Jul 7, 2026

Copy link
Copy Markdown

.github/ export-ignore does not work with git-archive-all, which checks parent directory paths without a trailing slash. Use .github export-ignore instead, which works for both Git and git-archive-all.

Note

make.bat is changed due to an automatic application of .gitattributes; honestly I'm a bit confused because my change didn't affect any line break rules... And it now breaks my other branches, because this auto-change happens on every branch on my local machine but only commited in this develop branch. Might same as #7505?


One additional concern is developers who have already run git add --renormalize on an older local branch. Even if they did not intentionally edit make.bat, that command may leave its normalized form staged in the index. A normal git pull --rebase will then refuse to start while such an uncommitted index change exists, so merging this PR alone will not unblock those branches: the local staged change remains until it is explicitly discarded, stashed, or committed. If it is committed merely to unblock the rebase, that commit may become redundant or empty once rebased onto a branch containing this normalization; it should only be skipped or dropped after confirming that it contains no real changes.

This is therefore a reason to merge the normalization promptly, ideally as an isolated commit, to minimize the period during which active branches differ. It will not, however, automatically clean up normalization changes that developers have already created locally.

Details

Reminder

  • I have read AGENTS.md and docs/developers_guide/agent_governance.md.
  • I have linked an issue or explained why this PR does not need one.
  • I have added adequate unit tests and/or case tests, or explained why not.
  • I have listed the exact verification commands run and their results.
  • I have described user-visible behavior changes, including INPUT parameter changes.
  • I have explained core-module impact for ESolver, HSolver, ElecState, Hamilt, Operator, Psi, or other source/ changes.
  • I have requested any needed governance exception below.

Linked Issue

None

Unit Tests and/or Case Tests for my changes

None

Exact Verification Performed

  • Commands run:
  • Result summary:
  • Checks not run, with reason:

What's changed?

-See above

Governance Checklist

  • Global dependencies: no net increase in GlobalV, GlobalC, or PARAM code references, or exception requested below with reason, scope, risk, and cleanup plan.
  • Default parameters: no new default arguments added to existing interfaces, or exception requested below.
  • Headers: no unnecessary header dependencies or .hpp propagation, or rationale provided below.
  • Line endings: text files use LF; only .bat and .cmd use CRLF.
  • Build linkage: new source files are listed in the relevant CMakeLists.txt, or rationale provided below.
  • Documentation: no documentation update is required
  • CodeRabbit: if automatic review has not started and the repository has CodeRabbit installed, request @coderabbitai review.

INPUT Parameter Changes

  • Parameters added/removed/changed: no
  • docs/parameters.yaml updated: no
  • docs/advanced/input_files/input-main.md updated: no
  • If not updated, explain why no INPUT documentation update is required: not affected

Core Module Impact

  • Affected core modules: no
  • Risk summary: no
  • Compatibility or performance impact:

Governance Exception

  • Rule:
  • Reason:
  • Scope:
  • User or maintenance risk:
  • Why the normal rule cannot be followed now:
  • Follow-up cleanup plan:
  • Requested approver:

Copilot AI review requested due to automatic review settings July 7, 2026 06:00

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adjusts repository export and normalization metadata by fixing the .gitattributes rule used to exclude the .github directory from git archive exports, and includes an incidental re-normalization of a Sphinx make.bat script due to attribute application.

Changes:

  • Fix .gitattributes export-ignore pattern for the .github directory.
  • Re-save source/source_basis/module_ao/1_Documents/sphinx/make.bat with no functional content changes (diff appears attributable to attribute-driven normalization).

Reviewed changes

Copilot reviewed 1 out of 2 changed files in this pull request and generated no comments.

File Description
.gitattributes Updates export-ignore entry to correctly target .github for archive exports.
source/source_basis/module_ao/1_Documents/sphinx/make.bat No functional changes; file content appears unchanged aside from normalization effects.

Comment thread .gitattributes
@ZhouXY-PKU

Copy link
Copy Markdown
Collaborator

Fix invalid export-ignore on .github/ folder

Note: make.bat is changed due to an automatic application of .gitattributes; honestly I'm a bit confused because my change didn't affect any line break rules... And it now breaks my other branches.
Details

Line ending of make.bat is changed from LF to CRLF?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants