Skip to content

W7: Feat/status diff polish - #54

Closed
Saanvi521 wants to merge 5 commits into
mainfrom
feat/status-diff-polish
Closed

Saanvi521 wants to merge 5 commits into
mainfrom
feat/status-diff-polish

Conversation

@Saanvi521

Copy link
Copy Markdown
Collaborator

Summary

  • status prints the branch first, then staged, not staged and untracked sections in sorted order. It shows no commits yet or clean when appropriate.
  • diff hunks now show 3 lines of context, and nearby edits share one hunk. Added or deleted binary files get a one-line summary, and unusual file paths print quoted.
  • add refuses paths outside the repo and file names with a tab or newline, and a corrupt index now gives a clear error. The README documents the new output.

Validation

  • scripts/quality-check.sh
  • Manual testing, if applicable:

Checklist

  • The change is focused and easy to review.
  • Tests were added or updated for behavior changes.
  • Documentation was updated for user-facing or setup changes.
  • No secrets, generated artifacts, or local-only files are included.

Notes for Reviewers

  • Updated two integration tests (Weeks 3 and 4) for the new On branch ... first line of status.
  • unresolved_merge_paths() is a placeholder name for M3's merge-state helper.

@Saanvi521 Saanvi521 changed the title Feat/status diff polish W7: Feat/status diff polish Oct 14, 2026
@aman-a-shah

Copy link
Copy Markdown
Collaborator

Superseded by #64, which includes the Week 7 status/diff polish rebased onto current main and is now merged. Closing this older conflicting PR; the implementation is preserved in #64.

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.

2 participants