Default squash-merge behaviour must be OFF (#8483)

My original PR introduced an entirely wrong behaviour which is _also_ a breaking change. Fix this bad default.
treeverse · Jan 9, 2025 · 3c0e561 · 3c0e561
1 parent 768d728
commit 3c0e561
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/api/swagger.yml b/api/swagger.yml
@@ -688,7 +688,7 @@ components:
           description: Allow merge when the branches have the same content
         squash_merge:
           type: boolean
-          default: true
+          default: false
           description: |
             If set, set only the destination branch as a parent, which "squashes" the merge to
             appear as a single commit on the destination branch.  The source commit is no longer

diff --git a/clients/java/api/openapi.yaml b/clients/java/api/openapi.yaml
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Merge.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Merge.java
diff --git a/clients/python/docs/Merge.md b/clients/python/docs/Merge.md
diff --git a/clients/python/lakefs_sdk/models/merge.py b/clients/python/lakefs_sdk/models/merge.py
diff --git a/clients/rust/docs/Merge.md b/clients/rust/docs/Merge.md
diff --git a/docs/assets/js/swagger.yml b/docs/assets/js/swagger.yml
@@ -688,7 +688,7 @@ components:
           description: Allow merge when the branches have the same content
         squash_merge:
           type: boolean
-          default: true
+          default: false
           description: |
             If set, set only the destination branch as a parent, which "squashes" the merge to
             appear as a single commit on the destination branch.  The source commit is no longer

diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go
@@ -3826,27 +3826,33 @@ func TestController_MergeSquashing(t *testing.T) {
 
 	cases := []struct {
 		Name               string
-		Squash             bool
+		Squash             *bool
 		ExpectedNumCommits int
 	}{{
 		Name:   "regular",
-		Squash: false,
+		Squash: swag.Bool(false),
 		// Commits: 1 "created repository", numCommits on branch, 1 merge.
 		ExpectedNumCommits: numCommits + 2,
 	}, {
 		Name:   "squash",
-		Squash: true,
+		Squash: swag.Bool(true),
 		// Commits: 1 "created repository", 1 merge.
 		ExpectedNumCommits: 2,
+	}, {
+		Name:   "default",
+		Squash: nil,
+		// Commits: 1 "created repository", 1 merge.
+		ExpectedNumCommits: numCommits + 2,
 	}}
+
 	for _, tc := range cases {
 		t.Run(tc.Name, func(t *testing.T) {
 			destinationBranch := "main-" + tc.Name
 
 			_, err := deps.catalog.CreateBranch(ctx, repo, destinationBranch, "main")
 			testutil.Must(t, err)
 
-			mergeResp, err := clt.MergeIntoBranchWithResponse(ctx, repo, "branch", destinationBranch, apigen.MergeIntoBranchJSONRequestBody{SquashMerge: &tc.Squash})
+			mergeResp, err := clt.MergeIntoBranchWithResponse(ctx, repo, "branch", destinationBranch, apigen.MergeIntoBranchJSONRequestBody{SquashMerge: tc.Squash})
 			testutil.MustDo(t, "perform merge into branch", err)
 			if !apiutil.IsStatusCodeOK(mergeResp.StatusCode()) {
 				t.Fatal("merge request failed", mergeResp.Status())