GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Preserve header-only Git file boundaries in UnifiedDiffReader by JimmyLiuJia · Pull Request #240 · java-diff-utils/java-diff-utils

Conversation

@JimmyLiuJia

@JimmyLiuJia JimmyLiuJia commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

UnifiedDiffReader merges consecutive Git file sections when the preceding file has no text hunk. A patch generated by Git containing a binary edit, an empty-file addition, a mode-only change, a 100% rename, and a text edit currently returns one file instead of five; the final text file also inherits the preceding files' metadata.

Start a fresh file when another diff command is encountered within the same header section. Regression tests cover header-only files before a text hunk, consecutive header-only files at EOF, and a text hunk followed by mode-only and binary changes. They check file counts, metadata isolation, and application of the text patch.

Validation on Temurin 17.0.20.1:

  • Replayed the Git-generated five-file patch: one file before the fix, five independent files afterward.
  • The first two regression tests fail on the original implementation and pass with the fix.
  • mvn -B package passes across both modules: 170 tests, no failures or errors, 3 existing skipped tests. Checkstyle reports no violations.

AI assistance was used to implement the fix and regression tests; the verification above was run locally.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@JimmyLiuJia
Preserve header-only Git file boundaries in UnifiedDiffReader
83d419d
@wumpz
wumpz merged commit 9a76f4d into java-diff-utils:master Oct 10, 2026
4 checks passed

Uh oh!

There was an error while loading. Please reload this page.

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

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@JimmyLiuJia @wumpz
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.