Indicate dirty state in short-format submodule diffs - #2209
Open
MsfPablo wants to merge 1 commit into
Open
Conversation
get_submodule_short_commit discarded the "-dirty" suffix git appends to the "+Subproject commit <hash>-dirty" line, so a dirty submodule rendered identically to a clean one (just red hash..green hash). Propagate the dirty flag and append "-dirty" to the printed commit range so it's visible again. Fixes dandavison#1838
Author
|
Following up on this one. It surfaces the dirty marker in short-format submodule diffs, matching what git itself shows. Glad to add a test case if that'd help review. |
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
When
diff.submodule = short(the default), a dirty submodule shows:get_submodule_short_commitmatched the optional-dirtysuffix but onlyever returned the hash capture group, discarding the flag. So delta
rendered a dirty submodule identically to a clean one — just
<red hash>..<green hash>— which is exactly the ambiguity described in #1838.This propagates the dirty flag through and appends
-dirtyto theprinted commit range when the working-tree side is dirty:
Test plan
cargo test— 438 passed, 0 failedtest_simple_dirty_submodule_diffto assert the-dirtysuffix is renderedcargo fmt --checkcleancargo clippy --all-targets— no new warnings introduced (pre-existing warnings are in unrelatedutils/process.rs)Fixes #1838