Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patchsets: Make virtual diff target with shared history #81

Merged
merged 1 commit into from
Jan 11, 2023

Conversation

jerry-skydio
Copy link
Collaborator

Previously we just made the first virtual diff target with no parent
resulting in a branch with no shared history with any other
branch. Strictly this shouldn't matter as we only use the
branch for diffs, but we've seen a few cases where pushing this
branch is specifically causing git push to take an incredibly
long time. I don't have a great way to explain this as the virtual
diff target should only be pushing the tree itself, all blobs within
it reuse blobs that were already present in the repo.

Try to create the target with a shared history from an
arbitrary commit to see if this resolves the issues we see.

Topic: vritdiff
Reviewers: brian-k

@jerry-skydio
Copy link
Collaborator Author

Reviews in this chain:
#81 patchsets: Make virtual diff target with shared history

@jerry-skydio
Copy link
Collaborator Author

jerry-skydio commented Oct 25, 2022

# head base diff date summary
0 e281c023 311ff10d diff Oct 24 17:49 PM 1 file changed, 2 insertions(+)
1 a3be2bdb 311ff10d diff Oct 24 17:50 PM 1 file changed, 1 insertion(+), 1 deletion(-)

Previously we just made the first virtual diff target with no parent
resulting in a branch with no shared history with any other
branch. Strictly this shouldn't matter as we only use the
branch for diffs, but we've seen a few cases where pushing this
branch is specifically causing git push to take an incredibly
long time. I don't have a great way to explain this as the virtual
diff target should only be pushing the tree itself, all blobs within
it reuse blobs that were already present in the repo.

Try to create the target with a shared history from an
arbitrary commit to see if this resolves the issues we see.

Topic: vritdiff
Reviewers: brian-k
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/vritdiff branch from e281c02 to a3be2bd Compare October 25, 2022 00:50
Copy link

@brian-kubisiak-skydio brian-kubisiak-skydio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a great way to explain this as the virtual diff target should only be pushing the tree itself

Git still has to figure this out though, potentially there's some slow logic in git-receive-pack when trying to determine the common ancestor when there isn't one?

@jerry-skydio jerry-skydio merged commit 9d34052 into main Jan 11, 2023
@jerry-skydio jerry-skydio deleted the jerry/revup/main/vritdiff branch January 11, 2023 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants