fix(git): compute diff stats including uncommitted changes for dirty branches#391
Open
fix(git): compute diff stats including uncommitted changes for dirty branches#391
Conversation
…branches When a branch is dirty, the daemon now computes diff stats that include both committed and uncommitted changes (working tree vs base branch) instead of only committed changes (HEAD vs base branch). This ensures the +/- columns in orch-monitor TUI show actual values when the branch state shows 'dirty' instead of showing '-'. Fixes: orch-401
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
getWorkingTreeDiffStatsfunction that computes diff from base branch to working tree (including uncommitted changes)GetWorktreeStatusto use this function when the branch is dirtyProblem
In
orch-monitorTUI, the +/- columns showed-even when the branch column showeddirty. This happened because:getDiffStatsFastcomputedgit diff --numstat origin/main...HEAD(only committed changes)-in the TUISolution
When the branch is dirty, compute diff stats using
git diff --numstat origin/main(without...HEAD), which compares the base branch directly to the working tree and includes both committed AND uncommitted changes.Evidence
Before fix (dirty branch with only uncommitted changes):
After fix:
Test output:
Files Changed
internal/git/gogit.go: AddedgetWorkingTreeDiffStats, updated dirty branch handlinginternal/git/gogit_test.go: New tests for dirty worktree diff statsFixes: orch-401