Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

gitserver: Fix Diff generation#62745

Merged
eseliger merged 1 commit intomainfrom
es/05-16-gitserverfixdiffgeneration
May 16, 2024
Merged

gitserver: Fix Diff generation#62745
eseliger merged 1 commit intomainfrom
es/05-16-gitserverfixdiffgeneration

Conversation

@eseliger
Copy link
Member

When switching to git-diff-tree, I looked over the fact that it can only work with treeish-es, not with rangespecs.

This PR translates ranges to the corresponding equivalents according to the Git docs:

.. -> A B
... -> $(git merge-base A B) B

Test plan:

Verified diffs are now generated properly again, also added another test to our suite.

When switching to git-diff-tree, I looked over the fact that it can only work with treeish-es, not with rangespecs.

This PR translates ranges to the corresponding equivalents according to the Git docs:

`..` -> `A B`
`...` -> `$(git merge-base A B) B`

Test plan:

Verified diffs are now generated properly again, also added another test to our suite.
@cla-bot cla-bot bot added the cla-signed label May 16, 2024
Copy link
Member Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @eseliger and the rest of your teammates on Graphite Graphite

@github-actions github-actions bot added team/product-platform team/source Tickets under the purview of Source - the one Source to graph it all labels May 16, 2024
@eseliger eseliger marked this pull request as ready for review May 16, 2024 20:37
@eseliger eseliger requested review from a team and camdencheek May 16, 2024 20:37
Copy link
Member

@camdencheek camdencheek left a comment

Choose a reason for hiding this comment

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

Thank you!

@eseliger eseliger merged commit 838c92f into main May 16, 2024
@eseliger eseliger deleted the es/05-16-gitserverfixdiffgeneration branch May 16, 2024 21:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cla-signed team/product-platform team/source Tickets under the purview of Source - the one Source to graph it all

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants