Improve upstream commit filtering #9668
Conversation
Modified the logic in stacks.rs to filter upstream commits more accurately by comparing tree changes between the last local commit and the upstream commit being looked at. Added import for tree_changes function from but_core::diff module. Adjusted upstream commit processing to skip upstream commits that do not introduce new changes relative to the last local commit, preventing redundant upstream commits from being shown after operations such as squash or rebase.
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
Nice one! I wonder - should we look into porting this into the graph implementation? |
|
I think it would need a test so it can be ported to the RefInfo test-suite. Chances are that this is already working there, but also, that it works differently. |
Maybe I can add a test in a bit. The WS3 version would look like this: #9676 Before merging this, maybe we should discuss how we want to display this information in the brave new world of WS3. The motivation for this change is to not show commits that are irrelevant, but if we're in a single branch world, maybe we still want to see all commits, event the ones considered 'irrelevant'. That's why I had only added it to the non-WS3 version of the details. |
Modified the logic in stacks.rs to filter upstream commits more accurately by comparing tree changes between the last local commit and the upstream commit being looked at.
Added import for tree_changes function from but_core::diff module. Adjusted upstream commit processing to skip upstream commits that do not introduce new changes relative to the last local commit, preventing redundant upstream commits from being shown after operations such as squash or rebase.