fix: improve gfd script to make it works for more cases.#5561
Merged
Conversation
Seems as old command `git merge-base --fork-point` doesn't work for some cases of tree structure Particularly it didn't worked for PR dashpay#5546: > @kwvg kwvg force-pushed the utilbps branch from 82d8a61 to f1bc1c3 Firstly, `git merge-base --fork-point develop 82d8a61d227fb66e2c6d4402ebb88e5740271eb9` returned me wrong commit. After pulling origin/develop it returns just an empty string. But `git show-branch --merge-base develop 82d8a61d227fb66e2c6d4402ebb88e5740271eb9` worked and returned correct commit: "3e1c6dd731 fix: reorder initializations (dashpay#5545)" which is the last commit for develop
PastaPastaPasta
approved these changes
Sep 5, 2023
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
Member
There was a problem hiding this comment.
no thoughts; utACK for squash merge
knst
marked this pull request as draft
September 6, 2023 11:12
knst
marked this pull request as ready for review
September 6, 2023 11:15
UdjinM6
changed the title
gfd script to make it works for more cases.
UdjinM6
approved these changes
Sep 9, 2023
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
Seems to work fine (tested on 5337), ACK
(fixed script name in the title)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
Seems as old command
git merge-base --fork-pointdoesn't work for some cases of tree structureParticularly it didn't worked for PR #5546:
Basically, one of the step
gfbscript --git merge-base --fork-point develop 82d8a61d227fb66e2c6d4402ebb88e5740271eb9returned me wrong commit. After pulling origin/develop it returns just an empty string.But
git show-branch --merge-base develop 82d8a61d227fb66e2c6d4402ebb88e5740271eb9worked and returned correct commit:"3e1c6dd731 fix: reorder initializations (#5545)" which is the last common commit with develop branch
What was done?
Updated recommended function
function gfd()in docHow Has This Been Tested?
Tested on PR #5546 that failed before and returned wrong diff for me
Breaking Changes
N/A
Checklist: