Summary of Changes

Hello @jdx, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the diff parsing capabilities to correctly interpret and apply diffs generated by Go tools like gofmt -d. By introducing a dedicated function to handle the .orig suffix often present in the 'before' file line of such diffs, it improves the robustness and compatibility of the system with various formatting tools. This change ensures that automated fixes and checks can proceed smoothly even when encountering these specific diff formats.

Highlights

• Go-style Diffs Support: Implemented support for parsing Go-style diffs, which often include a .orig suffix on the --- (original file) line.
• New strip_orig_suffix function: Added a utility function strip_orig_suffix() to correctly remove the .orig suffix from --- lines when the corresponding +++ line does not have it, ensuring proper diff application.
• Preservation of .orig extension: Ensured that the .orig suffix is correctly preserved when the file itself genuinely has a .orig extension.
• Test Coverage: Added new bats tests to validate the handling of .orig suffixes in diffs and confirmed all existing apply_check_diff.bats tests still pass.

Greptile Summary

This PR adds support for parsing Go-style diffs where tools like gofmt -d append .orig to the --- line (e.g., --- file.go.orig instead of --- file.go). The implementation adds a strip_orig_suffix() function that intelligently strips .orig only when the corresponding +++ line doesn't have it, preserving correct behavior for files that actually have .orig extensions.

Key changes:

• Added strip_orig_suffix() function in src/step/mod.rs to handle Go-style diff format
• Applied stripping in both apply_diff_output() (for git apply) and filter_files_from_check_diff() (for parsing file names)
• Added two comprehensive bats tests covering both the Go-style .orig suffix case and files with actual .orig extensions
• Cleaned up test suite by removing unnecessary git operations from several tests

Issues found:

• The replace(".orig", "") call will incorrectly strip all occurrences of .orig (including from directory names), which could break paths like path.orig/file.go.orig
• Minor inconsistency in diff.rs where prefix detection uses original input instead of the stripped version

Confidence Score: 3/5

• This PR has a logical bug that will cause incorrect behavior in edge cases with paths containing multiple .orig occurrences
• The core logic bug in strip_orig_suffix using replace instead of strip_suffix could cause incorrect path handling in production. While the common case (single .orig at end of filename) works correctly and is well-tested, edge cases like path.orig/file.go.orig will fail. The bug is in critical path-handling code.
• Pay close attention to src/step/mod.rs - the replace call needs to be changed to strip_suffix to fix the logic bug

Important Files Changed

_{Last reviewed commit: 08a2df8}

Greptile Summary

Adds support for parsing Go-style unified diffs where tools like gofmt -d append .orig suffix only to the --- line.

• Introduces strip_orig_suffix() helper that normalizes diffs by removing .orig from --- lines when the corresponding +++ line lacks it
• Correctly preserves .orig when both lines contain it (i.e., when the file itself has .orig extension)
• Applies normalization in two critical places: before parsing file paths from check_diff output and before piping diffs to git apply
• New bats tests validate both the .orig stripping behavior and the preservation of actual .orig files
• Test cleanup: removes unnecessary git add and git commit commands from existing tests

Confidence Score: 5/5

• Safe to merge - well-scoped change with comprehensive test coverage
• Implementation is clean and focused, using strip_suffix() which correctly handles edge cases. The logic only strips .orig when the +++ line doesn't have it, preventing incorrect stripping of files that actually have .orig extensions. Comprehensive test coverage validates both the new functionality and edge cases.
• No files require special attention

Important Files Changed

_{Last reviewed commit: d0b591c}

Greptile Summary

Adds support for Go-style unified diffs where --- lines include a .orig suffix (e.g., gofmt -d) by introducing strip_orig_suffix() function that normalizes these diffs before processing.

Key Changes:

• New strip_orig_suffix() function in src/step/mod.rs detects and strips .orig from --- lines when the corresponding +++ line lacks it
• Integration points: called before file extraction (filter_files_from_check_diff) and diff application (apply_diff_output)
• Correctly handles edge cases: preserves .orig in directory paths, handles tab-separated timestamps, works with files actually named *.orig
• Test coverage includes both Go-style .orig suffix and actual .orig files
• Test cleanup: removes unnecessary git commit commands from several tests

Minor Issue:

• Function unconditionally adds trailing newline to output (line 80); git apply is typically tolerant of this, but exact input preservation would be more correct

Confidence Score: 4/5

• Safe to merge with very low risk; addresses a legitimate compatibility issue with Go tooling
• Implementation correctly handles the primary use case and edge cases (directory paths with .orig, actual .orig files, timestamps). Only minor style issue is the unconditional trailing newline addition, which git apply tolerates. Good test coverage validates both the new feature and existing functionality.
• No files require special attention

Important Files Changed

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[check_diff command output] --> B{Contains .orig suffix?}
    B -->|Yes| C[strip_orig_suffix]
    B -->|No| D[Use as-is]
    C --> E[Normalized diff]
    D --> E
    E --> F[filter_files_from_check_diff]
    E --> G[apply_diff_output]
    F --> H[Extract file paths]
    G --> I{Has a/b prefixes?}
    I -->|Yes| J[git apply -p1]
    I -->|No| K[git apply -p0]
    J --> L{Success?}
    K --> L
    L -->|Yes| M[Changes applied]
    L -->|No| N[Fall back to fixer]
    
    C1[--- file.go.orig] --> C2{+++ has .orig?}
    C2 -->|No| C3[Strip .orig from ---]
    C2 -->|Yes| C4[Keep as-is]
    C3 --> C5[--- file.go]
    
    style C fill:#e1f5ff
    style C1 fill:#fff4e1
    style C5 fill:#e8f5e9

_{Last reviewed commit: f86f004}