preventing graveler.go:Merge to merge a branch to itself

treeverse · Nov 29, 2024 · 5085291 · 5085291
1 parent 7f58e03
commit 5085291
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/graveler/graveler.go b/pkg/graveler/graveler.go
@@ -2897,6 +2897,9 @@ func (g *Graveler) Merge(ctx context.Context, repository *RepositoryRecord, dest
 		if err != nil {
 			return nil, err
 		}
+		if fromCommit.CommitID == toCommit.CommitID {
+			return nil, ErrSameBranch
+		}
 		lg.WithFields(logging.Fields{
 			"source_meta_range":      fromCommit.MetaRangeID,
 			"destination_meta_range": toCommit.MetaRangeID,