mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-13 19:28:50 -06:00
Code Issues Packages Projects Releases 129 Wiki Activity

PR feedback

Browse Source
This commit is contained in:
Zach Musgrave
2023-01-23 13:41:33 -08:00
parent c35c7f6546
commit 78b4ab8003
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/libraries/doltcore/env/actions/branch.go vendored
View File

@@ -199,7 +199,7 @@ func validateBranchMergedIntoCurrentWorkingBranch(ctx context.Context, dbdata en
return err
}
isMerged, _ := branchHead.CanFastForwardTo(ctx, cwbHead)
isMerged, err := branchHead.CanFastForwardTo(ctx, cwbHead)
if err != nil {
if errors.Is(err, doltdb.ErrUpToDate) {
return nil
@@ -208,7 +208,6 @@ func validateBranchMergedIntoCurrentWorkingBranch(ctx context.Context, dbdata en
return ErrUnmergedBranch
}
// TODO: no common ancestor is not an error
return err
}
@@ -259,7 +258,6 @@ func validateBranchMergedIntoUpstream(ctx context.Context, dbdata env.DbData, br
if errors.Is(err, doltdb.ErrIsAhead) {
return ErrUnmergedBranch
}
// TODO: no common ancestor is not an error
return err
}