Fix create branch with no commitID (treeverse#1280)

guy-har · web-flow · commit c48013626302 · 2021-01-22T17:03:53.000+02:00
diff --git a/graveler/errors.go b/graveler/errors.go
@@ -20,6 +20,7 @@ var (
 	ErrInvalidRef              = fmt.Errorf("ref: %w", ErrInvalidValue)
 	ErrInvalidCommitID         = fmt.Errorf("commit id: %w", ErrInvalidValue)
 	ErrCommitNotFound          = fmt.Errorf("commit %w", ErrNotFound)
+	ErrCreateBranchNoCommit    = fmt.Errorf("can't create a branch without commit")
 	ErrRepositoryNotFound      = fmt.Errorf("repository %w", ErrNotFound)
 	ErrBranchNotFound          = fmt.Errorf("branch %w", ErrNotFound)
 	ErrTagNotFound             = fmt.Errorf("tag %w", ErrNotFound)
diff --git a/graveler/graveler.go b/graveler/graveler.go
@@ -600,7 +600,9 @@ func (g *Graveler) CreateBranch(ctx context.Context, repositoryID RepositoryID,
 	if err != nil {
 		return nil, err
 	}
-
+	if reference.CommitID() == "" {
+		return nil, ErrCreateBranchNoCommit
+	}
 	newBranch := Branch{
 		CommitID:     reference.CommitID(),
 		StagingToken: generateStagingToken(repositoryID, branchID),
diff --git a/graveler/graveler_test.go b/graveler/graveler_test.go
@@ -243,7 +243,8 @@ func TestGraveler_CreateBranch(t *testing.T) {
 	gravel := graveler.NewGraveler(branchLocker, nil,
 		nil,
 		&testutil.RefsFake{
-			Err: graveler.ErrNotFound,
+			Err:      graveler.ErrNotFound,
+			CommitID: "8888888798e3aeface8e62d1c7072a965314b4",
 		},
 	)
 	_, err := gravel.CreateBranch(context.Background(), "", "", "")
diff --git a/graveler/testutil/fakes.go b/graveler/testutil/fakes.go
@@ -195,7 +195,8 @@ func (m *RefsFake) RevParse(context.Context, graveler.RepositoryID, graveler.Ref
 	if m.RefType == graveler.ReferenceTypeBranch {
 		branch = DefaultBranchID
 	}
-	return NewFakeReference(m.RefType, branch, ""), nil
+
+	return NewFakeReference(m.RefType, branch, m.CommitID), nil
 }
 
 func (m *RefsFake) GetRepository(context.Context, graveler.RepositoryID) (*graveler.Repository, error) {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,8 @@ func (m *RefsFake) RevParse(context.Context, graveler.RepositoryID, graveler.Ref`
`195`	`195`	`if m.RefType == graveler.ReferenceTypeBranch {`
`196`	`196`	`branch = DefaultBranchID`
`197`	`197`	`}`
`198`		`- return NewFakeReference(m.RefType, branch, ""), nil`
	`198`	`+`
	`199`	`+ return NewFakeReference(m.RefType, branch, m.CommitID), nil`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`func (m RefsFake) GetRepository(context.Context, graveler.RepositoryID) (graveler.Repository, error) {`