go: env/actions/branch: Fix error message for invalid branch name giv…

…en to create branch.
rmr1154 · Feb 15, 2022 · 27348e2 · 27348e2
1 parent f2fa2fa
commit 27348e2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/go/libraries/doltcore/env/actions/branch.go b/go/libraries/doltcore/env/actions/branch.go
@@ -203,6 +203,10 @@ func CreateBranchWithStartPt(ctx context.Context, dbData env.DbData, newBranch,
 }
 
 func CreateBranchOnDB(ctx context.Context, ddb *doltdb.DoltDB, newBranch, startingPoint string, force bool, headRef ref.DoltRef) error {
+	if !doltdb.IsValidUserBranchName(newBranch) {
+		return doltdb.ErrInvBranchName
+	}
+
 	branchRef := ref.NewBranchRef(newBranch)
 	hasRef, err := ddb.HasRef(ctx, branchRef)
 	if err != nil {
@@ -213,10 +217,6 @@ func CreateBranchOnDB(ctx context.Context, ddb *doltdb.DoltDB, newBranch, starti
 		return ErrAlreadyExists
 	}
 
-	if !doltdb.IsValidUserBranchName(newBranch) {
-		return doltdb.ErrInvBranchName
-	}
-
 	cs, err := doltdb.NewCommitSpec(startingPoint)
 	if err != nil {
 		return err