return commit hash for dolt_merge() when --no-ff is not specified
#6281
Conversation
This file contains 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
jycor
changed the title
--no-ff is not specifieddolt_merge() when --no-ff is not specified
timsehn
reviewed
Jul 5, 2023
fulghum
reviewed
Jul 5, 2023
fulghum
reviewed
Jul 5, 2023
jycor
commented
Jul 6, 2023
| @@ -92,6 +92,10 @@ func doDoltMerge(ctx *sql.Context, args []string) (string, int, int, error) { | |||
| return "", noConflictsOrViolations, threeWayMerge, err | |||
| } | |||
|
|
|||
| if apr.NArg() < 1 { | |||
There was a problem hiding this comment.
prevents panic caused by branchName := apr.Arg(0) when running query call dolt_merge()
fulghum
reviewed
Jul 7, 2023
| Query: "CALL DOLT_COMMIT('-am','made changes in other')", | ||
| SkipResultsCheck: true, | ||
| Query: "CALL DOLT_COMMIT('-am','made changes in other')", | ||
| Expected: []sql.Row{{doltCommit}}, |
There was a problem hiding this comment.
This is so awesome to see us able to remove so many SkipResultsChecks! 🙏 Great work!
added 2 commits
July 7, 2023 13:51
fulghum
approved these changes
Jul 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix a bug where we didn't return the commit hash for
dolt_merge()when the --no-ff argument wasn't specified, and we performed a non-ff merge.Made it so that fast-forward merged will also return the new HEAD commit hash.
Additionally, changed many enginetests to use the new
DoltCommitTypeto validate dolt commit hashes.Also prevents panics when doing
call dolt_merge().Companion PR:
dolthub/go-mysql-server#1865