Murmele
Wrong Diff - not all changes are shown
If I show the diff with gittyup, not all changes/diffs are displayed.
When I open TortoiseMerge, all changes are displayed.
Gittyup:
marked and below are not shown.
I update gittyup to current develop and tortoisemerge to current version.
This is likely related to issue #710. I've dug into this a bit and found some issues in the code concerning selecting/displaying diff hunks. There is currently a hard-coded limit of 4 items in DiffView::fetchMore(int fetchWidgets = 4); which sometimes prevents the loaded diff hunks from reaching the bottom of the window, which prevents scrolling updates from loading more diff hunks...
I'm looking into a way to refactor some of this code to make it simpler and more reliable in a way that should solve the issue you're experiencing...
This is likely related to issue #710. I've dug into this a bit and found some issues in the code concerning selecting/displaying diff hunks. There is currently a hard-coded limit of 4 items in
DiffView::fetchMore(int fetchWidgets = 4);which sometimes prevents the loaded diff hunks from reaching the bottom of the window, which prevents scrolling updates from loading more diff hunks...
Not OP, but similar symptom (high res display, many hunks in diff, but only [the first] four were displayed in Gittyup. Your hypothesis seems to fully explain my issue, as confirmed by this workaround:
- Decrease window height substantially
- Select a different file in the file browser, then re-select the original file
- Scroll down in the diff pane; all hunks are now visible
