Skip to content

Fix virtual graph lines claiming shared history#2775

Open
Shriram-Vasudevan wants to merge 1 commit into
git-up:masterfrom
Shriram-Vasudevan:fix-336-virtual-graph-lines
Open

Fix virtual graph lines claiming shared history#2775
Shriram-Vasudevan wants to merge 1 commit into
git-up:masterfrom
Shriram-Vasudevan:fix-336-virtual-graph-lines

Conversation

@Shriram-Vasudevan
Copy link
Copy Markdown

Fixes #336.

Summary

  • process real graph nodes before dummy/virtual branch-tip nodes when generating each layer
  • prevents a virtual branch tip from becoming the primary line for a shared commit and rendering the rest of its ancestry as thin/dashed
  • add a regression test with out-of-order committer dates, matching the rebase/amend scenario described in the issue

Verification

  • clang -fsyntax-only ... GitUpKit/Interface/GIGraph.m
  • git diff --no-index --check GitUp-baseline GitUp

Could not run the XCTest suite locally because this machine only has Command Line Tools installed; xcodebuild requires full Xcode. clang-format is also unavailable locally.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

Visual glitch in graph, thin dashed line all the way

1 participant