Skip to content

fix: Smudge non-annexed files, ensuring eol enforcement #3664

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

Merged
merged 2 commits into from
Dec 1, 2025
Merged

fix: Smudge non-annexed files, ensuring eol enforcement #3664

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c3e663
fix: Smudge non-annexed files, ensuring eol enforcement
effigies Nov 24, 2025
937d9ca
fix: Avoid creating empty commits
effigies Nov 24, 2025
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
15 changes: 11 additions & 4 deletions services/datalad/datalad_service/common/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ async def git_commit(
sentry_sdk.capture_exception(e)
logger.error(f'Failed to read index after git-annex add: {e}')
raise OpenNeuroGitError(f'Failed to read index: {e}') from e
# Ensure non-annexed files are smudged, e.g., update end-of-lines
# but do not "fix" unrelated paths
repo.index.add_all(file_paths)
return await git_commit_index(repo, author, message, parents)


Expand All @@ -173,10 +176,14 @@ async def git_commit_index(
committer = pygit2.Signature(COMMITTER_NAME, COMMITTER_EMAIL)
if not author:
author = committer
if parents is None:
parent_commits = [str(repo.head.target)]
else:
parent_commits = parents

parent_commits = [repo.head.target] if parents is None else parents
if len(parent_commits) == 1 and not any(
repo.index.diff_to_tree(repo.get(parent_commits[0]).tree)
):
# No changes to commit
return

tree = repo.index.write_tree()
commit = repo.create_commit(
'refs/heads/main', author, committer, message, tree, parent_commits
Expand Down