Merge branch 'sh-fix-squash-renamed-files-target-branch' into 'master'

Fix squash when target branch has a renamed file

Closes #2395

See merge request gitlab-org/gitaly!1786

9 files changed, 204 insertions, 178 deletions

diff --git a/changelogs/unreleased/sh-fix-squash-renamed-files-target-branch.yml b/changelogs/unreleased/sh-fix-squash-renamed-files-target-branch.yml
new file mode 100644
index 000000000..74a0bbb62
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-squash-renamed-files-target-branch.yml
@@ -0,0 +1,5 @@
+---
+title: Fix squash when target repository has a renamed file
+merge_request: 1786
+author:
+type: fixed
diff --git a/internal/service/operations/squash.go b/internal/service/operations/squash.go
index 56480fc60..b51572a4a 100644
--- a/internal/service/operations/squash.go
+++ b/internal/service/operations/squash.go
@@ -41,10 +41,6 @@ func validateUserSquashRequest(req *gitalypb.UserSquashRequest) error {
 		return fmt.Errorf("empty SquashId")
 	}
 
-	if len(req.GetBranch()) == 0 {
-		return fmt.Errorf("empty Branch")
-	}
-
 	if req.GetStartSha() == "" {
 		return fmt.Errorf("empty StartSha")
 	}
diff --git a/internal/service/operations/squash_test.go b/internal/service/operations/squash_test.go
index 25e4936e0..7115f7977 100644
--- a/internal/service/operations/squash_test.go
+++ b/internal/service/operations/squash_test.go
@@ -43,7 +43,6 @@ func TestSuccessfulUserSquashRequest(t *testing.T) {
 		Repository:    testRepo,
 		User:          user,
 		SquashId:      "1",
-		Branch:        []byte(branchName),
 		Author:        author,
 		CommitMessage: commitMessage,
 		StartSha:      startSha,
@@ -94,7 +93,6 @@ func TestSuccessfulUserSquashRequestWith3wayMerge(t *testing.T) {
 		Repository:    testRepo,
 		User:          user,
 		SquashId:      "1",
-		Branch:        []byte("gitaly/squash-test"),
 		Author:        author,
 		CommitMessage: commitMessage,
 		// The diff between two of these commits results in some changes to files/ruby/popen.rb
@@ -108,7 +106,7 @@ func TestSuccessfulUserSquashRequestWith3wayMerge(t *testing.T) {
 
 	commit, err := log.GetCommit(ctx, testRepo, response.SquashSha)
 	require.NoError(t, err)
-	require.Equal(t, []string{"3d05a143ac193c1a6fe4d046a6e3fe71e825258a"}, commit.ParentIds)
+	require.Equal(t, []string{"6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"}, commit.ParentIds)
 	require.Equal(t, author.Name, commit.Author.Name)
 	require.Equal(t, author.Email, commit.Author.Email)
 	require.Equal(t, user.Name, commit.Committer.Name)
@@ -145,7 +143,6 @@ func TestSplitIndex(t *testing.T) {
 		Repository:    testRepo,
 		User:          user,
 		SquashId:      "1",
-		Branch:        []byte(branchName),
 		Author:        author,
 		CommitMessage: commitMessage,
 		StartSha:      startSha,
@@ -158,7 +155,69 @@ func TestSplitIndex(t *testing.T) {
 	require.False(t, ensureSplitIndexExists(t, testRepoPath))
 }
 
-func TestFailedUserSquashRequestDueToGitError(t *testing.T) {
+func TestSquashRequestWithRenamedFiles(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	server, serverSocketPath := runOperationServiceServer(t)
+	defer server.Stop()
+
+	client, conn := NewOperationClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepoWithWorktree(t)
+	defer cleanupFn()
+
+	originalFilename := "original-file.txt"
+	renamedFilename := "renamed-file.txt"
+
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "config", "user.name", string(author.Name))
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "config", "user.email", string(author.Email))
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "checkout", "-b", "squash-rename-test", "master")
+	require.NoError(t, ioutil.WriteFile(filepath.Join(testRepoPath, originalFilename), []byte("This is a test"), 0644))
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "add", ".")
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-m", "test file")
+
+	startCommitID := text.ChompBytes(testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "rev-parse", "HEAD"))
+
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "mv", originalFilename, renamedFilename)
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-a", "-m", "renamed test file")
+
+	// Modify the original file in another branch
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "checkout", "-b", "squash-rename-branch", startCommitID)
+	require.NoError(t, ioutil.WriteFile(filepath.Join(testRepoPath, originalFilename), []byte("This is a change"), 0644))
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-a", "-m", "test")
+
+	require.NoError(t, ioutil.WriteFile(filepath.Join(testRepoPath, originalFilename), []byte("This is another change"), 0644))
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "commit", "-a", "-m", "test")
+
+	endCommitID := text.ChompBytes(testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "rev-parse", "HEAD"))
+
+	request := &gitalypb.UserSquashRequest{
+		Repository:    testRepo,
+		User:          user,
+		SquashId:      "1",
+		Author:        author,
+		CommitMessage: commitMessage,
+		StartSha:      startCommitID,
+		EndSha:        endCommitID,
+	}
+
+	response, err := client.UserSquash(ctx, request)
+	require.NoError(t, err)
+	require.Empty(t, response.GetGitError())
+
+	commit, err := log.GetCommit(ctx, testRepo, response.SquashSha)
+	require.NoError(t, err)
+	require.Equal(t, []string{startCommitID}, commit.ParentIds)
+	require.Equal(t, author.Name, commit.Author.Name)
+	require.Equal(t, author.Email, commit.Author.Email)
+	require.Equal(t, user.Name, commit.Committer.Name)
+	require.Equal(t, user.Email, commit.Committer.Email)
+	require.Equal(t, commitMessage, commit.Subject)
+}
+
+func TestSuccessfulUserSquashRequestWithMissingFileOnTargetBranch(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
@@ -172,13 +231,11 @@ func TestFailedUserSquashRequestDueToGitError(t *testing.T) {
 	defer cleanup()
 
 	conflictingStartSha := "bbd36ad238d14e1c03ece0f3358f545092dc9ca3"
-	branchName := "gitaly-stuff"
 
 	request := &gitalypb.UserSquashRequest{
 		Repository:    testRepo,
 		User:          user,
 		SquashId:      "1",
-		Branch:        []byte(branchName),
 		Author:        author,
 		CommitMessage: commitMessage,
 		StartSha:      conflictingStartSha,
@@ -187,7 +244,7 @@ func TestFailedUserSquashRequestDueToGitError(t *testing.T) {
 
 	response, err := client.UserSquash(ctx, request)
 	require.NoError(t, err)
-	require.Contains(t, response.GitError, "error: large_diff_old_name.md: does not exist in index")
+	require.Empty(t, response.GetGitError())
 }
 
 func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
@@ -211,7 +268,6 @@ func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
 				Repository:    nil,
 				User:          user,
 				SquashId:      "1",
-				Branch:        []byte("some-branch"),
 				Author:        user,
 				CommitMessage: commitMessage,
 				StartSha:      startSha,
@@ -225,7 +281,6 @@ func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
 				Repository:    testRepo,
 				User:          nil,
 				SquashId:      "1",
-				Branch:        []byte("some-branch"),
 				Author:        user,
 				CommitMessage: commitMessage,
 				StartSha:      startSha,
@@ -239,21 +294,6 @@ func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
 				Repository:    testRepo,
 				User:          user,
 				SquashId:      "",
-				Branch:        []byte("some-branch"),
-				Author:        user,
-				CommitMessage: commitMessage,
-				StartSha:      startSha,
-				EndSha:        endSha,
-			},
-			code: codes.InvalidArgument,
-		},
-		{
-			desc: "empty Branch",
-			request: &gitalypb.UserSquashRequest{
-				Repository:    testRepo,
-				User:          user,
-				SquashId:      "1",
-				Branch:        nil,
 				Author:        user,
 				CommitMessage: commitMessage,
 				StartSha:      startSha,
@@ -267,7 +307,6 @@ func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
 				Repository:    testRepo,
 				User:          user,
 				SquashId:      "1",
-				Branch:        []byte("some-branch"),
 				Author:        user,
 				CommitMessage: commitMessage,
 				StartSha:      "",
@@ -281,7 +320,6 @@ func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
 				Repository:    testRepo,
 				User:          user,
 				SquashId:      "1",
-				Branch:        []byte("some-branch"),
 				Author:        user,
 				CommitMessage: commitMessage,
 				StartSha:      startSha,
@@ -295,7 +333,6 @@ func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
 				Repository:    testRepo,
 				User:          user,
 				SquashId:      "1",
-				Branch:        []byte("some-branch"),
 				Author:        nil,
 				CommitMessage: commitMessage,
 				StartSha:      startSha,
@@ -309,7 +346,6 @@ func TestFailedUserSquashRequestDueToValidations(t *testing.T) {
 				Repository:    testRepo,
 				User:          user,
 				SquashId:      "1",
-				Branch:        []byte("some-branch"),
 				Author:        user,
 				CommitMessage: nil,
 				StartSha:      startSha,
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go
index 886d071c1..7cf4dedc7 100644
--- a/proto/go/gitalypb/operations.pb.go
+++ b/proto/go/gitalypb/operations.pb.go
@@ -2252,7 +2252,6 @@ type UserSquashRequest struct {
 	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
 	User                 *User       `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
 	SquashId             string      `protobuf:"bytes,3,opt,name=squash_id,json=squashId,proto3" json:"squash_id,omitempty"`
-	Branch               []byte      `protobuf:"bytes,4,opt,name=branch,proto3" json:"branch,omitempty"`
 	StartSha             string      `protobuf:"bytes,5,opt,name=start_sha,json=startSha,proto3" json:"start_sha,omitempty"`
 	EndSha               string      `protobuf:"bytes,6,opt,name=end_sha,json=endSha,proto3" json:"end_sha,omitempty"`
 	Author               *User       `protobuf:"bytes,7,opt,name=author,proto3" json:"author,omitempty"`
@@ -2308,13 +2307,6 @@ func (m *UserSquashRequest) GetSquashId() string {
 	return ""
 }
 
-func (m *UserSquashRequest) GetBranch() []byte {
-	if m != nil {
-		return m.Branch
-	}
-	return nil
-}
-
 func (m *UserSquashRequest) GetStartSha() string {
 	if m != nil {
 		return m.StartSha
@@ -2745,143 +2737,143 @@ func init() {
 func init() { proto.RegisterFile("operations.proto", fileDescriptor_1b4a5877375e491e) }
 
 var fileDescriptor_1b4a5877375e491e = []byte{
-	// 2168 bytes of a gzipped FileDescriptorProto
+	// 2175 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x23, 0x49,
-	0x15, 0x4f, 0xdb, 0x8e, 0xe3, 0xbc, 0x38, 0x89, 0x53, 0xb3, 0x3b, 0xeb, 0xf5, 0x4c, 0x98, 0x6c,
-	0x67, 0x86, 0xf1, 0x0c, 0xe0, 0xf9, 0x60, 0x05, 0x12, 0xd2, 0x82, 0x26, 0x8e, 0x43, 0x66, 0xb5,
+	0x15, 0x4f, 0xdb, 0x8e, 0xe3, 0xbc, 0x38, 0x89, 0x53, 0xbb, 0x3b, 0xeb, 0xf5, 0x4c, 0x98, 0x6c,
+	0x67, 0x86, 0xf1, 0x0c, 0xe0, 0xf9, 0x60, 0x05, 0x12, 0xd2, 0x82, 0x26, 0x8e, 0x43, 0x66, 0xb4,
 	0xf9, 0xa0, 0x93, 0x01, 0xb1, 0x42, 0x34, 0x1d, 0xbb, 0x62, 0xb7, 0xb0, 0xdd, 0xbd, 0xd5, 0xed,
-	0x30, 0xe1, 0x80, 0x90, 0x90, 0x58, 0x8e, 0x9c, 0xd8, 0x13, 0x12, 0x9c, 0x90, 0x10, 0x17, 0x2e,
-	0x08, 0x71, 0x40, 0x88, 0x1b, 0x5c, 0xb9, 0xf3, 0x07, 0x20, 0xc1, 0x01, 0xc4, 0x65, 0x4f, 0xa8,
-	0xea, 0xbd, 0xb6, 0xbb, 0xba, 0xdb, 0xd9, 0x64, 0x49, 0xb4, 0x03, 0xda, 0x5b, 0xfc, 0xea, 0xf5,
-	0xab, 0xf7, 0x7e, 0xef, 0xb3, 0xaa, 0x02, 0x15, 0xcf, 0xe7, 0xc2, 0x09, 0x5d, 0x6f, 0x18, 0x34,
-	0x7c, 0xe1, 0x85, 0x1e, 0x2b, 0x76, 0xdd, 0xd0, 0xe9, 0x9f, 0xd6, 0xca, 0x41, 0xcf, 0x11, 0xbc,
-	0x83, 0x54, 0xf3, 0xd7, 0x06, 0xbc, 0xf2, 0x2c, 0xe0, 0xa2, 0x29, 0xb8, 0x13, 0xf2, 0x0d, 0xe1,
-	0x0c, 0xdb, 0x3d, 0x8b, 0xbf, 0x33, 0xe2, 0x41, 0xc8, 0x1e, 0x03, 0x08, 0xee, 0x7b, 0x81, 0x1b,
-	0x7a, 0xe2, 0xb4, 0x6a, 0xac, 0x19, 0xf5, 0x85, 0xc7, 0xac, 0x81, 0x62, 0x1a, 0xd6, 0x78, 0xc5,
-	0x8a, 0x71, 0xb1, 0x5b, 0xb0, 0x70, 0xa4, 0x84, 0xd8, 0x43, 0x67, 0xc0, 0xab, 0xb9, 0x35, 0xa3,
-	0x5e, 0xb6, 0x00, 0x49, 0xbb, 0xce, 0x80, 0xb3, 0x35, 0x28, 0x8c, 0x02, 0x2e, 0xaa, 0x79, 0x25,
-	0xae, 0x1c, 0x89, 0x93, 0x3a, 0x58, 0x6a, 0x45, 0x8a, 0x08, 0x42, 0x47, 0x84, 0xb6, 0xef, 0xb9,
-	0xc3, 0xb0, 0x5a, 0x40, 0x11, 0x8a, 0xb4, 0x2f, 0x29, 0xe6, 0x10, 0xaa, 0x69, 0x95, 0x03, 0xdf,
-	0x1b, 0x06, 0x9c, 0x7d, 0x12, 0x8a, 0xb8, 0x19, 0xe9, 0xbb, 0x14, 0x6d, 0x40, 0x7c, 0xb4, 0xca,
-	0xee, 0xc3, 0x8a, 0x2f, 0xb8, 0x2d, 0x78, 0x9b, 0xbb, 0x27, 0xdc, 0xe6, 0x42, 0x78, 0x42, 0x69,
-	0x3b, 0x6f, 0x2d, 0xfb, 0x82, 0x5b, 0x48, 0x6f, 0x49, 0xb2, 0xf9, 0x07, 0xc2, 0xe8, 0x99, 0xdf,
-	0x79, 0x51, 0x30, 0xba, 0x0e, 0xc5, 0x21, 0xff, 0x8e, 0xe0, 0x27, 0x04, 0x0f, 0xfd, 0x92, 0x74,
-	0xaf, 0xdf, 0x91, 0xf4, 0x59, 0xa4, 0xe3, 0x2f, 0x73, 0x0b, 0x21, 0xd3, 0x2d, 0x20, 0xc8, 0x32,
-	0xa1, 0x30, 0xb2, 0xa1, 0xf8, 0x31, 0x41, 0xb1, 0xc9, 0xfb, 0xfc, 0xc5, 0x80, 0x22, 0x32, 0x4d,
-	0xd7, 0xe8, 0x43, 0x98, 0xf6, 0xae, 0x01, 0x2f, 0x4d, 0x04, 0x1d, 0x3a, 0xdd, 0xff, 0xc6, 0xae,
-	0x57, 0xa1, 0x14, 0x3a, 0xdd, 0xb8, 0x51, 0x73, 0xa1, 0xd3, 0x3d, 0xa7, 0x45, 0x4d, 0x78, 0x39,
-	0xa1, 0xc8, 0x87, 0x30, 0xe7, 0xcf, 0x64, 0x0e, 0x66, 0xc9, 0x47, 0x68, 0x0e, 0xbb, 0x0b, 0xcb,
-	0xa1, 0x23, 0xba, 0x3c, 0xb4, 0x05, 0x3f, 0x71, 0x03, 0xd7, 0x1b, 0x52, 0xd0, 0x2e, 0x21, 0xd9,
-	0x22, 0x2a, 0xab, 0xc2, 0xdc, 0x80, 0x07, 0x81, 0xd3, 0xe5, 0x14, 0xbd, 0xd1, 0x4f, 0xf3, 0xbb,
-	0x88, 0x48, 0xcc, 0x16, 0x42, 0x64, 0x15, 0xf2, 0xa1, 0xd3, 0x25, 0x2b, 0x16, 0xa2, 0xcd, 0x25,
-	0x87, 0xa4, 0xcb, 0x74, 0xe0, 0xcf, 0xdd, 0x20, 0x0c, 0x94, 0xd6, 0x25, 0x8b, 0x7e, 0x65, 0x03,
-	0x99, 0xcf, 0x06, 0xf2, 0x2f, 0x06, 0x5c, 0x97, 0x9b, 0xef, 0x70, 0xd1, 0xbd, 0x84, 0x88, 0x8f,
-	0xf0, 0xca, 0x4d, 0xc5, 0xeb, 0x06, 0xcc, 0xb7, 0xbd, 0xc1, 0xc0, 0x0d, 0x6d, 0xb7, 0x43, 0x4a,
-	0x95, 0x90, 0xf0, 0xb4, 0x23, 0x2d, 0xa2, 0xfa, 0x46, 0x89, 0x4f, 0xf5, 0x6c, 0x2a, 0x76, 0xec,
-	0x25, 0x98, 0x75, 0x7c, 0xbf, 0x7f, 0x5a, 0x2d, 0x2a, 0x08, 0xf0, 0x87, 0xf9, 0x2b, 0x4a, 0x64,
-	0xcd, 0x2a, 0x02, 0x55, 0x53, 0xc0, 0x48, 0x28, 0xb0, 0x01, 0x8b, 0x94, 0xb1, 0x23, 0x55, 0x4c,
-	0xc8, 0xf1, 0xab, 0x91, 0x21, 0x7b, 0x51, 0xdf, 0x41, 0xa1, 0x58, 0x71, 0xac, 0xf2, 0x51, 0xec,
-	0x57, 0x36, 0xfc, 0x85, 0x4c, 0xf8, 0xdf, 0x2c, 0x94, 0x72, 0x95, 0xbc, 0xf9, 0x6e, 0x0e, 0x23,
+	0x30, 0xe1, 0x80, 0x90, 0x90, 0x58, 0x8e, 0x9c, 0x98, 0x13, 0x12, 0x37, 0x24, 0xc4, 0x85, 0x0b,
+	0x42, 0x1c, 0x10, 0xe2, 0x06, 0x57, 0xee, 0xfc, 0x01, 0x48, 0x70, 0x00, 0x71, 0xd9, 0x13, 0xaa,
+	0x7a, 0xaf, 0xed, 0xae, 0xee, 0x76, 0x36, 0x59, 0x12, 0xed, 0x80, 0xb8, 0xc5, 0xaf, 0x5e, 0xbf,
+	0x7a, 0xef, 0xf7, 0xbe, 0xaa, 0x5e, 0x05, 0x2a, 0x9e, 0xcf, 0x85, 0x13, 0xba, 0xde, 0x30, 0x68,
+	0xf8, 0xc2, 0x0b, 0x3d, 0x56, 0xec, 0xba, 0xa1, 0xd3, 0x3f, 0xad, 0x95, 0x83, 0x9e, 0x23, 0x78,
+	0x07, 0xa9, 0xe6, 0xaf, 0x0c, 0x78, 0xfd, 0x59, 0xc0, 0x45, 0x53, 0x70, 0x27, 0xe4, 0x1b, 0xc2,
+	0x19, 0xb6, 0x7b, 0x16, 0x7f, 0x6f, 0xc4, 0x83, 0x90, 0x3d, 0x02, 0x10, 0xdc, 0xf7, 0x02, 0x37,
+	0xf4, 0xc4, 0x69, 0xd5, 0x58, 0x33, 0xea, 0x0b, 0x8f, 0x58, 0x03, 0xc5, 0x34, 0xac, 0xf1, 0x8a,
+	0x15, 0xe3, 0x62, 0x37, 0x61, 0xe1, 0x48, 0x09, 0xb1, 0x87, 0xce, 0x80, 0x57, 0x73, 0x6b, 0x46,
+	0xbd, 0x6c, 0x01, 0x92, 0x76, 0x9d, 0x01, 0x67, 0x6b, 0x50, 0x18, 0x05, 0x5c, 0x54, 0xf3, 0x4a,
+	0x5c, 0x39, 0x12, 0x27, 0x75, 0xb0, 0xd4, 0x8a, 0x14, 0x11, 0x84, 0x8e, 0x08, 0x6d, 0xdf, 0x73,
+	0x87, 0x61, 0xb5, 0x80, 0x22, 0x14, 0x69, 0x5f, 0x52, 0xcc, 0x21, 0x54, 0xd3, 0x2a, 0x07, 0xbe,
+	0x37, 0x0c, 0x38, 0xfb, 0x24, 0x14, 0x71, 0x33, 0xd2, 0x77, 0x29, 0xda, 0x80, 0xf8, 0x68, 0x95,
+	0xdd, 0x83, 0x15, 0x5f, 0x70, 0x5b, 0xf0, 0x36, 0x77, 0x4f, 0xb8, 0xcd, 0x85, 0xf0, 0x84, 0xd2,
+	0x76, 0xde, 0x5a, 0xf6, 0x05, 0xb7, 0x90, 0xde, 0x92, 0x64, 0xf3, 0xf7, 0x84, 0xd1, 0x33, 0xbf,
+	0xf3, 0xb2, 0x60, 0x74, 0x0d, 0x8a, 0x43, 0xfe, 0x1d, 0xc1, 0x4f, 0x08, 0x1e, 0xfa, 0x25, 0xe9,
+	0x5e, 0xbf, 0x23, 0xe9, 0xb3, 0x48, 0xc7, 0x5f, 0xe6, 0x16, 0x42, 0xa6, 0x5b, 0x40, 0x90, 0x65,
+	0x42, 0x61, 0x64, 0x43, 0xf1, 0x63, 0x82, 0x62, 0x93, 0xf7, 0xf9, 0xcb, 0x01, 0x45, 0x64, 0x9a,
+	0xae, 0xd1, 0x47, 0x30, 0xed, 0x7d, 0x03, 0x5e, 0x9d, 0x08, 0x3a, 0x74, 0xba, 0xff, 0x89, 0x5d,
+	0x6f, 0x40, 0x29, 0x74, 0xba, 0x71, 0xa3, 0xe6, 0x42, 0xa7, 0x7b, 0x4e, 0x8b, 0x9a, 0xf0, 0x5a,
+	0x42, 0x91, 0x8f, 0x60, 0xce, 0x9f, 0xc8, 0x1c, 0xcc, 0x92, 0x8f, 0xd1, 0x1c, 0x76, 0x07, 0x96,
+	0x43, 0x47, 0x74, 0x79, 0x68, 0x0b, 0x7e, 0xe2, 0x06, 0xae, 0x37, 0xa4, 0xa0, 0x5d, 0x42, 0xb2,
+	0x45, 0x54, 0x56, 0x85, 0xb9, 0x01, 0x0f, 0x02, 0xa7, 0xcb, 0x29, 0x7a, 0xa3, 0x9f, 0xe6, 0x77,
+	0x11, 0x91, 0x98, 0x2d, 0x84, 0xc8, 0x2a, 0xe4, 0x43, 0xa7, 0x4b, 0x56, 0x2c, 0x44, 0x9b, 0x4b,
+	0x0e, 0x49, 0x97, 0xe9, 0xc0, 0x9f, 0xbb, 0x41, 0x18, 0x28, 0xad, 0x4b, 0x16, 0xfd, 0xca, 0x06,
+	0x32, 0x9f, 0x0d, 0xe4, 0x9f, 0x0d, 0xb8, 0x26, 0x37, 0xdf, 0xe1, 0xa2, 0x7b, 0x09, 0x11, 0x1f,
+	0xe1, 0x95, 0x9b, 0x8a, 0xd7, 0x75, 0x98, 0x6f, 0x7b, 0x83, 0x81, 0x1b, 0xda, 0x6e, 0x87, 0x94,
+	0x2a, 0x21, 0xe1, 0x49, 0x47, 0x5a, 0x44, 0xf5, 0x8d, 0x12, 0x9f, 0xea, 0xd9, 0x54, 0xec, 0xd8,
+	0xab, 0x30, 0xeb, 0xf8, 0x7e, 0xff, 0xb4, 0x5a, 0x54, 0x10, 0xe0, 0x0f, 0xf3, 0x97, 0x94, 0xc8,
+	0x9a, 0x55, 0x04, 0xaa, 0xa6, 0x80, 0x91, 0x50, 0x60, 0x03, 0x16, 0x29, 0x63, 0x47, 0xaa, 0x98,
+	0x90, 0xe3, 0x57, 0x23, 0x43, 0xf6, 0xa2, 0xbe, 0x83, 0x42, 0xb1, 0xe2, 0x58, 0xe5, 0xa3, 0xd8,
+	0xaf, 0x6c, 0xf8, 0x0b, 0x99, 0xf0, 0x3f, 0x2d, 0x94, 0x72, 0x95, 0xbc, 0xf9, 0x7e, 0x0e, 0x23,
 	0x40, 0xa9, 0x7b, 0xe8, 0x59, 0xfc, 0xf8, 0x6a, 0x7d, 0xb0, 0x0a, 0x10, 0x78, 0x23, 0xd1, 0xe6,
 	0x76, 0xd0, 0x73, 0xc8, 0x09, 0xf3, 0x48, 0x39, 0xe8, 0x39, 0x53, 0xbd, 0xb0, 0x0a, 0x30, 0x0e,
 	0xf5, 0x63, 0x72, 0xc4, 0x7c, 0x14, 0xe5, 0xc7, 0x71, 0x27, 0x15, 0x75, 0x27, 0xd5, 0xa1, 0x72,
 	0xec, 0x8a, 0x20, 0xb4, 0x7d, 0x47, 0xf0, 0x21, 0x7e, 0x3e, 0x87, 0x49, 0xa2, 0xe8, 0xfb, 0x8a,
 	0x6c, 0xf1, 0x63, 0xd3, 0x89, 0x45, 0x23, 0x01, 0x71, 0x1e, 0xb7, 0x5d, 0xa4, 0xdf, 0x7d, 0x0f,
-	0x5e, 0xce, 0xf4, 0xe2, 0xd9, 0x3b, 0xbc, 0x06, 0x65, 0x09, 0xb1, 0xdd, 0x56, 0x49, 0xda, 0xa1,
-	0x8c, 0x5b, 0x90, 0x34, 0xcc, 0xdb, 0x0e, 0xbb, 0x03, 0x4b, 0x14, 0x3b, 0x11, 0x53, 0x5e, 0x31,
-	0x51, 0x44, 0x11, 0x9b, 0xf9, 0x33, 0x03, 0xae, 0x49, 0x1b, 0xb7, 0xb6, 0x5e, 0xd4, 0x74, 0x33,
-	0x7f, 0x48, 0xd5, 0x75, 0xa2, 0x22, 0x39, 0x21, 0x95, 0x1e, 0xc6, 0x25, 0xa5, 0xc7, 0x14, 0x5f,
-	0xfd, 0x9e, 0x12, 0xa3, 0xd9, 0xe3, 0x42, 0x9c, 0xee, 0xbb, 0xed, 0x6f, 0x5f, 0x2d, 0x5a, 0xf7,
-	0xa0, 0x88, 0xe0, 0x50, 0xde, 0xaf, 0x44, 0x3c, 0x5f, 0x76, 0xc3, 0xa6, 0x5a, 0xb0, 0x88, 0x21,
-	0xd9, 0xdb, 0x0b, 0xa9, 0xde, 0x3e, 0xbd, 0x66, 0xdd, 0x87, 0x15, 0x1c, 0x01, 0xe3, 0x02, 0x30,
-	0x65, 0x96, 0xd5, 0xc2, 0xc6, 0x44, 0xca, 0x1b, 0x50, 0x41, 0xde, 0x98, 0xb5, 0x73, 0x53, 0xad,
-	0xc5, 0xcf, 0x27, 0x04, 0xf3, 0x9f, 0x39, 0x4c, 0xa8, 0x38, 0x80, 0x97, 0xeb, 0x4b, 0x8c, 0x75,
-	0x3b, 0x14, 0x3c, 0xe1, 0x4b, 0x5c, 0x38, 0x14, 0x1c, 0x7d, 0x29, 0x33, 0x88, 0x22, 0x31, 0xde,
-	0x90, 0x16, 0x90, 0x86, 0x2c, 0x17, 0xa8, 0x9c, 0xac, 0x0d, 0xd7, 0x53, 0x5b, 0xdb, 0x6d, 0xaf,
-	0x83, 0x68, 0x2f, 0x3d, 0x6e, 0xc4, 0xdd, 0x9b, 0x36, 0xbf, 0xd1, 0xd4, 0xd5, 0xb3, 0xae, 0x25,
-	0xf4, 0x6d, 0x7a, 0x1d, 0x6e, 0xbe, 0x0e, 0xcb, 0x09, 0x3e, 0x56, 0x82, 0xc2, 0xee, 0xde, 0x6e,
-	0xab, 0x32, 0xc3, 0xe6, 0x61, 0xb6, 0xb5, 0xb3, 0x7f, 0xf8, 0xf5, 0x8a, 0xc1, 0xca, 0x50, 0x6a,
-	0xee, 0xed, 0x6e, 0xbd, 0xf5, 0xb4, 0x79, 0x58, 0xc9, 0x99, 0xbf, 0xcb, 0xc1, 0x8a, 0x0a, 0x2a,
-	0x7e, 0xc2, 0xa5, 0x37, 0x3e, 0x8e, 0xd8, 0x0b, 0x44, 0xec, 0xdf, 0x72, 0xc0, 0xe2, 0xe0, 0xfd,
-	0x7f, 0x44, 0xab, 0xfd, 0x01, 0xd1, 0x7a, 0x5f, 0x73, 0xad, 0x66, 0xfa, 0x55, 0x46, 0xea, 0xbf,
-	0x73, 0x70, 0x43, 0xe5, 0x87, 0x32, 0x6b, 0xcb, 0xed, 0xf3, 0xe0, 0x49, 0x5b, 0xa2, 0xb8, 0xcd,
-	0x9d, 0x0e, 0x17, 0x6c, 0x0b, 0x8a, 0x8e, 0xfa, 0xad, 0xe0, 0x4e, 0x26, 0x55, 0xf6, 0x47, 0x0d,
-	0xfc, 0x71, 0x78, 0xea, 0x73, 0x8b, 0xbe, 0x96, 0x5d, 0xe8, 0xd8, 0xed, 0x73, 0xdb, 0x77, 0xc2,
-	0x1e, 0x8d, 0xd8, 0x25, 0x49, 0xd8, 0x77, 0xc2, 0x1e, 0x5b, 0x87, 0x45, 0x5f, 0xce, 0xce, 0xde,
-	0x28, 0x40, 0x86, 0xbc, 0x62, 0x28, 0x47, 0x44, 0xc5, 0x24, 0x9b, 0xab, 0x13, 0xf0, 0xcf, 0xbd,
-	0x6e, 0xb7, 0xbd, 0x61, 0xc8, 0xe9, 0xe4, 0x2c, 0x9b, 0xab, 0xa2, 0x36, 0x91, 0xc8, 0xee, 0x41,
-	0x85, 0x3f, 0xe7, 0xed, 0x51, 0xc8, 0x6d, 0x29, 0x7f, 0x10, 0x21, 0x5c, 0xb2, 0x96, 0x89, 0xbe,
-	0x45, 0x64, 0xb9, 0xad, 0x3b, 0x3c, 0xe6, 0x62, 0x2c, 0x10, 0x27, 0xc8, 0xb2, 0x22, 0x92, 0x3c,
-	0xf3, 0x19, 0xc0, 0xc4, 0x1c, 0x06, 0x50, 0x6c, 0x5a, 0xad, 0x27, 0x87, 0x12, 0xd3, 0x25, 0x00,
-	0xfc, 0xdb, 0xde, 0x7c, 0x6a, 0x55, 0x0c, 0xb9, 0xf6, 0x6c, 0x7f, 0x53, 0xae, 0xe5, 0x24, 0xf2,
-	0x3b, 0x7b, 0x5f, 0x6d, 0x55, 0xf2, 0x92, 0xba, 0xd9, 0x7a, 0xab, 0x75, 0xd8, 0xaa, 0x14, 0xa4,
-	0x17, 0x9a, 0xdb, 0x3b, 0x7b, 0x9b, 0x95, 0x59, 0xf3, 0x27, 0x06, 0xf5, 0xb5, 0x24, 0x84, 0xec,
-	0x0d, 0x28, 0xf6, 0x14, 0x8c, 0x14, 0xe0, 0xeb, 0xe7, 0x40, 0x7c, 0x7b, 0xc6, 0xa2, 0x8f, 0x58,
-	0x0d, 0xe6, 0x22, 0x73, 0x14, 0xcc, 0xdb, 0x33, 0x56, 0x44, 0xd8, 0x30, 0x61, 0x4d, 0x96, 0x0c,
-	0x9b, 0xe2, 0x5a, 0xe2, 0x13, 0xd8, 0xe8, 0x20, 0xdb, 0x77, 0x4e, 0xfb, 0x9e, 0xd3, 0x31, 0x7f,
-	0x9b, 0x87, 0x9b, 0x89, 0x9d, 0xa8, 0x7e, 0x51, 0x44, 0x5c, 0x4d, 0x15, 0x4b, 0x94, 0xa6, 0x7c,
-	0xaa, 0x34, 0xdd, 0x81, 0x25, 0x52, 0x3b, 0xaa, 0x50, 0x58, 0xbe, 0x16, 0x91, 0xba, 0x43, 0x75,
-	0xea, 0xd3, 0xc0, 0x88, 0xcd, 0x19, 0x85, 0x3d, 0x4f, 0xa0, 0x38, 0x2c, 0x66, 0x15, 0x5c, 0x79,
-	0xa2, 0x16, 0x94, 0xd0, 0x06, 0x5c, 0xd3, 0xb9, 0xf9, 0xc0, 0x71, 0xfb, 0x54, 0xd7, 0x56, 0xe2,
-	0xec, 0x2d, 0xb9, 0x90, 0x5d, 0x05, 0xe7, 0xce, 0x5f, 0x05, 0x4b, 0xe7, 0xae, 0x82, 0xf2, 0x58,
-	0x73, 0xec, 0x89, 0x36, 0xaf, 0xce, 0xe3, 0xb1, 0x46, 0xfd, 0x90, 0x69, 0x84, 0x42, 0xe5, 0xd8,
-	0x0e, 0x38, 0xcc, 0x29, 0xc2, 0x41, 0xcf, 0x31, 0x7f, 0x43, 0x27, 0xb9, 0xb4, 0xeb, 0xd8, 0x17,
-	0x13, 0x41, 0x75, 0x7b, 0x4a, 0x50, 0x69, 0xae, 0x8e, 0x45, 0xd5, 0xe7, 0xc7, 0x65, 0x20, 0xa7,
-	0x57, 0xdd, 0xec, 0xa0, 0x9c, 0x89, 0xf2, 0x7e, 0x63, 0x1d, 0x5e, 0x4b, 0x87, 0x9c, 0xc0, 0x5d,
-	0xc6, 0x31, 0xf7, 0xcb, 0xe8, 0x92, 0x2e, 0xae, 0xc8, 0x25, 0x96, 0xfd, 0x5b, 0xb0, 0xe0, 0x0e,
-	0x3b, 0xfc, 0xb9, 0x56, 0xf0, 0x41, 0x91, 0xce, 0x28, 0xe4, 0x53, 0xce, 0xcb, 0xbf, 0x18, 0xf7,
-	0x76, 0x59, 0x78, 0xae, 0x7c, 0x76, 0x17, 0x6a, 0x9b, 0xd8, 0xec, 0x8e, 0x84, 0x33, 0x8e, 0xca,
-	0xab, 0x40, 0x79, 0xa3, 0x82, 0x64, 0x16, 0xcf, 0x76, 0x48, 0x91, 0x67, 0xbb, 0x2f, 0xc1, 0x8a,
-	0xe0, 0x03, 0x2f, 0xe4, 0xf1, 0xc0, 0x2c, 0x4e, 0x55, 0xb8, 0x82, 0xcc, 0xb1, 0xc8, 0x5c, 0x87,
-	0x45, 0x12, 0x40, 0xdb, 0x63, 0x02, 0x94, 0x91, 0x88, 0x6e, 0xf8, 0x42, 0xae, 0x6a, 0x98, 0xdf,
-	0x37, 0xa2, 0x46, 0x8e, 0x48, 0x8d, 0xef, 0x34, 0x80, 0x8c, 0x92, 0xfa, 0xe1, 0x31, 0x8b, 0xcc,
-	0x94, 0xfa, 0x5d, 0xe0, 0x74, 0x20, 0xf1, 0xe9, 0x26, 0x1a, 0x74, 0xa9, 0x4b, 0xdd, 0x59, 0xa9,
-	0xf0, 0x77, 0xaa, 0x66, 0xa8, 0x42, 0xd3, 0x1b, 0x1e, 0xbb, 0x62, 0xe0, 0x1c, 0xf5, 0xc7, 0x7e,
-	0x6b, 0x25, 0x12, 0xe3, 0x53, 0x7a, 0x1b, 0xce, 0xfe, 0xaa, 0x91, 0xca, 0x8f, 0xeb, 0xd1, 0x25,
-	0x84, 0x3a, 0x15, 0x6e, 0xcf, 0xd0, 0x35, 0x44, 0xed, 0x8f, 0x39, 0x28, 0x5e, 0x69, 0xdd, 0xfc,
-	0x9f, 0x8d, 0x10, 0x56, 0x87, 0x8a, 0xf4, 0x9d, 0x3f, 0x0a, 0x7a, 0xb6, 0xe7, 0xab, 0x9b, 0xfc,
-	0x6a, 0x69, 0x2d, 0x5f, 0x9f, 0xb7, 0x96, 0xba, 0x6e, 0xb8, 0x3f, 0x0a, 0x7a, 0x7b, 0x48, 0xdd,
-	0xb8, 0x07, 0x77, 0x55, 0x0d, 0x21, 0x43, 0xdb, 0x13, 0x7f, 0xa4, 0x2a, 0xc9, 0x5f, 0x0d, 0x58,
-	0x9d, 0xe2, 0x39, 0x8a, 0xbe, 0x5b, 0xe9, 0xe8, 0xdb, 0x9e, 0x89, 0xc7, 0xdf, 0x5d, 0x58, 0x22,
-	0x06, 0xe9, 0x42, 0x37, 0x3a, 0xe9, 0x6f, 0xcf, 0x58, 0x8b, 0x48, 0x7f, 0x82, 0xe4, 0x8b, 0x14,
-	0x0d, 0x3d, 0x50, 0x0b, 0x7a, 0xa0, 0x6e, 0xdc, 0x87, 0xfa, 0x74, 0xfb, 0x50, 0xed, 0xb1, 0x81,
-	0x3f, 0xa7, 0xea, 0x73, 0xf0, 0xce, 0xc8, 0x09, 0xae, 0xfe, 0xe6, 0x20, 0x50, 0xdb, 0xc4, 0x62,
-	0x0b, 0x09, 0x67, 0xc4, 0x96, 0xd6, 0xa1, 0x66, 0xf5, 0x0e, 0xc5, 0x5e, 0x81, 0x39, 0x3e, 0xec,
-	0xa8, 0xa5, 0xa2, 0x5a, 0x2a, 0xf2, 0x61, 0x47, 0x2e, 0xdc, 0x86, 0x22, 0x76, 0x60, 0x3a, 0x28,
-	0xe8, 0xea, 0xd0, 0x5a, 0xc6, 0x0c, 0x50, 0xca, 0x98, 0x01, 0x4c, 0x17, 0xcb, 0x4e, 0x04, 0xd1,
-	0xa4, 0xec, 0x90, 0x35, 0xb1, 0xb2, 0x83, 0x14, 0xa9, 0xc1, 0x59, 0xa5, 0x04, 0x2f, 0xe9, 0xac,
-	0xb4, 0xbb, 0xcd, 0x9f, 0xd2, 0xf5, 0x84, 0x8c, 0x89, 0xd3, 0x7d, 0x27, 0x9c, 0x5c, 0xe6, 0x9c,
-	0xd9, 0x71, 0x53, 0xec, 0x8d, 0xac, 0x39, 0xce, 0x97, 0x0c, 0x3c, 0x98, 0xcc, 0x71, 0x44, 0xa8,
-	0xfd, 0xc0, 0xb8, 0xe2, 0xaa, 0xb2, 0x0e, 0x8b, 0x74, 0xcf, 0x47, 0x3e, 0xa6, 0x81, 0x1c, 0x89,
-	0x98, 0xc0, 0xe3, 0x69, 0x52, 0x55, 0x3a, 0x5b, 0xe9, 0x96, 0xca, 0xc7, 0x6f, 0xe0, 0x44, 0x12,
-	0xb7, 0xf7, 0xf2, 0xfa, 0xba, 0xf9, 0x0f, 0x03, 0x6a, 0x93, 0x67, 0x9f, 0x83, 0xd1, 0xd1, 0xc0,
-	0xeb, 0x8c, 0xfa, 0xfc, 0xca, 0xaf, 0x4e, 0x29, 0x08, 0x63, 0x57, 0xa7, 0x48, 0x39, 0xeb, 0xea,
-	0xf4, 0x26, 0xcc, 0x07, 0x91, 0x82, 0xd1, 0xcd, 0xe9, 0x98, 0x90, 0x11, 0xd9, 0xc5, 0xac, 0xc8,
-	0xfe, 0x93, 0x81, 0xa7, 0xb5, 0x94, 0xc1, 0x1f, 0xcd, 0xed, 0x5c, 0xea, 0x8c, 0x5c, 0x48, 0x9d,
-	0x91, 0xdf, 0x2c, 0x94, 0xf2, 0x95, 0x82, 0x95, 0x3e, 0x76, 0x3f, 0xfe, 0xd7, 0x02, 0x54, 0xc6,
-	0xfa, 0x1c, 0x70, 0x71, 0xe2, 0xb6, 0x39, 0xfb, 0x16, 0x54, 0x92, 0x4f, 0x9f, 0xec, 0x96, 0x36,
-	0x6b, 0xa6, 0xdf, 0x71, 0x6b, 0x6b, 0xd3, 0x19, 0x10, 0x17, 0x73, 0xfe, 0xfd, 0xf7, 0xea, 0xb3,
-	0x25, 0xa3, 0x66, 0x3c, 0x8a, 0x76, 0x88, 0xbf, 0x14, 0xea, 0x3b, 0x64, 0xbc, 0x82, 0xea, 0x3b,
-	0x64, 0x3d, 0x32, 0x66, 0xec, 0x10, 0x7f, 0xb0, 0xd3, 0x77, 0xc8, 0x78, 0x5c, 0xd4, 0x77, 0xc8,
-	0x7a, 0xeb, 0x8b, 0xef, 0xf0, 0x35, 0x58, 0xd4, 0x9e, 0x8b, 0xd8, 0xcd, 0x34, 0x02, 0x93, 0x17,
-	0xb1, 0xda, 0xea, 0x94, 0xd5, 0xa9, 0x82, 0xc7, 0x2f, 0x73, 0xba, 0xe0, 0xe4, 0xcb, 0xa1, 0x2e,
-	0x38, 0xf5, 0x9c, 0x17, 0x17, 0xfc, 0x36, 0x2c, 0xe9, 0xb7, 0xfa, 0x4c, 0xfb, 0x36, 0xf5, 0xec,
-	0x51, 0xfb, 0xc4, 0xb4, 0xe5, 0xb4, 0x6c, 0x07, 0x96, 0x13, 0x2f, 0x3d, 0x2c, 0xfd, 0xb5, 0x8e,
-	0xf6, 0xad, 0xa9, 0xeb, 0x29, 0xf1, 0x75, 0xe3, 0xa1, 0xc1, 0x0e, 0xa1, 0x1c, 0xbf, 0x0d, 0x67,
-	0x37, 0xe2, 0xdf, 0x27, 0xae, 0xf1, 0x6b, 0x37, 0xb3, 0x17, 0xa7, 0x82, 0x32, 0xb9, 0x9a, 0xd4,
-	0x41, 0x49, 0x5d, 0x79, 0xeb, 0xa0, 0xa4, 0x6f, 0x34, 0x33, 0x40, 0x89, 0x9d, 0xa8, 0x74, 0x50,
-	0xd2, 0x67, 0x3e, 0x1d, 0x94, 0x8c, 0xa3, 0x98, 0xb9, 0xf0, 0xfe, 0x7b, 0xf5, 0xb9, 0x92, 0x51,
-	0xcb, 0x3f, 0x6a, 0x3c, 0xaa, 0x1b, 0xec, 0x2b, 0x00, 0x93, 0x51, 0x8b, 0xbd, 0x9a, 0x1e, 0x9c,
-	0x23, 0xc1, 0xb5, 0xac, 0x25, 0x92, 0x59, 0x1e, 0xab, 0xfc, 0xa3, 0x9c, 0xc1, 0x46, 0xd8, 0x4d,
-	0x53, 0xd3, 0x1b, 0xbb, 0x7d, 0x9e, 0xb1, 0xbc, 0x76, 0xe7, 0x03, 0xb8, 0x32, 0xed, 0x78, 0x68,
-	0xb0, 0xdd, 0xc8, 0x92, 0x13, 0x2e, 0xc2, 0xa4, 0x25, 0xb1, 0x1b, 0xdc, 0xa4, 0x25, 0xf1, 0x4b,
-	0xba, 0x38, 0xf8, 0x24, 0x0f, 0x07, 0x10, 0x5d, 0x9e, 0x36, 0xb7, 0xe9, 0xf2, 0xf4, 0x79, 0x25,
-	0x2e, 0xef, 0x9b, 0x18, 0x28, 0x93, 0x2e, 0xaa, 0x07, 0x4a, 0x6a, 0x9a, 0xd0, 0x03, 0x25, 0xdd,
-	0x7c, 0x93, 0x9e, 0x74, 0xf1, 0x3d, 0x2a, 0xd1, 0x55, 0x98, 0x99, 0xae, 0x7a, 0xc9, 0x1e, 0x5b,
-	0x5b, 0x3f, 0x93, 0x27, 0x65, 0xca, 0xc6, 0xc3, 0xb7, 0xe5, 0x07, 0x7d, 0xe7, 0xa8, 0xd1, 0xf6,
-	0x06, 0x0f, 0xf0, 0xcf, 0xcf, 0x78, 0xa2, 0xfb, 0x00, 0xc5, 0x3c, 0x50, 0xff, 0xb5, 0xf3, 0xa0,
-	0xeb, 0xd1, 0x6f, 0xff, 0xe8, 0xa8, 0xa8, 0x48, 0x9f, 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x4a, 0xa4, 0xe2, 0x74, 0xf2, 0x23, 0x00, 0x00,
+	0x5e, 0xcb, 0xf4, 0xe2, 0xd9, 0x3b, 0xbc, 0x09, 0x65, 0x09, 0xb1, 0xdd, 0x56, 0x49, 0xda, 0xa1,
+	0x8c, 0x5b, 0x90, 0x34, 0xcc, 0xdb, 0x0e, 0xbb, 0x0d, 0x4b, 0x14, 0x3b, 0x11, 0x53, 0x5e, 0x31,
+	0x51, 0x44, 0x11, 0x9b, 0xf9, 0x33, 0x03, 0x5e, 0x91, 0x36, 0x6e, 0x6d, 0xbd, 0xac, 0xe9, 0x66,
+	0xfe, 0x90, 0xaa, 0xeb, 0x44, 0x45, 0x72, 0x42, 0x2a, 0x3d, 0x8c, 0x4b, 0x4a, 0x8f, 0x29, 0xbe,
+	0xfa, 0x1d, 0x25, 0x46, 0xb3, 0xc7, 0x85, 0x38, 0xdd, 0x77, 0xdb, 0xdf, 0xbe, 0x5a, 0xb4, 0xee,
+	0x42, 0x11, 0xc1, 0xa1, 0xbc, 0x5f, 0x89, 0x78, 0xbe, 0xec, 0x86, 0x4d, 0xb5, 0x60, 0x11, 0x43,
+	0xb2, 0xb7, 0x17, 0x52, 0xbd, 0x7d, 0x7a, 0xcd, 0xba, 0x07, 0x2b, 0x78, 0x04, 0x8c, 0x0b, 0xc0,
+	0x94, 0x59, 0x56, 0x0b, 0x1b, 0x13, 0x29, 0x6f, 0x43, 0x05, 0x79, 0x63, 0xd6, 0xce, 0x4d, 0xb5,
+	0x16, 0x3f, 0x9f, 0x10, 0xcc, 0x7f, 0xe4, 0x30, 0xa1, 0xe2, 0x00, 0x5e, 0xae, 0x2f, 0x31, 0xd6,
+	0xed, 0x50, 0xf0, 0x84, 0x2f, 0x71, 0xe1, 0x50, 0x70, 0xf4, 0xa5, 0xcc, 0x20, 0x8a, 0xc4, 0x78,
+	0x43, 0x5a, 0x40, 0x1a, 0xb2, 0x5c, 0xa0, 0x72, 0xb2, 0x36, 0x5c, 0x4b, 0x6d, 0x6d, 0xb7, 0xbd,
+	0x0e, 0xa2, 0xbd, 0xf4, 0xa8, 0x11, 0x77, 0x6f, 0xda, 0xfc, 0x46, 0x53, 0x57, 0xcf, 0x7a, 0x25,
+	0xa1, 0x6f, 0xd3, 0xeb, 0x70, 0xf3, 0x2d, 0x58, 0x4e, 0xf0, 0xb1, 0x12, 0x14, 0x76, 0xf7, 0x76,
+	0x5b, 0x95, 0x19, 0x36, 0x0f, 0xb3, 0xad, 0x9d, 0xfd, 0xc3, 0xaf, 0x57, 0x0c, 0x56, 0x86, 0x52,
+	0x73, 0x6f, 0x77, 0xeb, 0x9d, 0x27, 0xcd, 0xc3, 0x4a, 0xce, 0xfc, 0x6d, 0x0e, 0x56, 0x54, 0x50,
+	0xf1, 0x13, 0x2e, 0xbd, 0xf1, 0xff, 0x88, 0xbd, 0x40, 0xc4, 0xfe, 0x35, 0x07, 0x2c, 0x0e, 0xde,
+	0xff, 0x46, 0xb4, 0xda, 0x1f, 0x12, 0xad, 0xf7, 0x34, 0xd7, 0x6a, 0xa6, 0x5f, 0x65, 0xa4, 0xfe,
+	0x2b, 0x07, 0xd7, 0x55, 0x7e, 0x28, 0xb3, 0xb6, 0xdc, 0x3e, 0x0f, 0x1e, 0xb7, 0x25, 0x8a, 0xdb,
+	0xdc, 0xe9, 0x70, 0xc1, 0xb6, 0xa0, 0xe8, 0xa8, 0xdf, 0x0a, 0xee, 0x64, 0x52, 0x65, 0x7f, 0xd4,
+	0xc0, 0x1f, 0x87, 0xa7, 0x3e, 0xb7, 0xe8, 0x6b, 0xd9, 0x85, 0x8e, 0xdd, 0x3e, 0xb7, 0x7d, 0x27,
+	0xec, 0xd1, 0x11, 0xbb, 0x24, 0x09, 0xfb, 0x4e, 0xd8, 0x63, 0xeb, 0xb0, 0xe8, 0xcb, 0xb3, 0xb3,
+	0x37, 0x0a, 0x90, 0x21, 0xaf, 0x18, 0xca, 0x11, 0x51, 0x31, 0xc9, 0xe6, 0xea, 0x04, 0xfc, 0x73,
+	0x6f, 0xd9, 0x6d, 0x6f, 0x18, 0x72, 0xba, 0x39, 0xcb, 0xe6, 0xaa, 0xa8, 0x4d, 0x24, 0xb2, 0xbb,
+	0x50, 0xe1, 0xcf, 0x79, 0x7b, 0x14, 0x72, 0x5b, 0xca, 0x1f, 0x44, 0x08, 0x97, 0xac, 0x65, 0xa2,
+	0x6f, 0x11, 0x59, 0x6e, 0xeb, 0x0e, 0x8f, 0xb9, 0x18, 0x0b, 0xc4, 0x13, 0x64, 0x59, 0x11, 0x49,
+	0x9e, 0xf9, 0x0c, 0x60, 0x62, 0x0e, 0x03, 0x28, 0x36, 0xad, 0xd6, 0xe3, 0x43, 0x89, 0xe9, 0x12,
+	0x00, 0xfe, 0x6d, 0x6f, 0x3e, 0xb1, 0x2a, 0x86, 0x5c, 0x7b, 0xb6, 0xbf, 0x29, 0xd7, 0x72, 0x12,
+	0xf9, 0x9d, 0xbd, 0xaf, 0xb6, 0x2a, 0x79, 0x49, 0xdd, 0x6c, 0xbd, 0xd3, 0x3a, 0x6c, 0x55, 0x0a,
+	0xd2, 0x0b, 0xcd, 0xed, 0x9d, 0xbd, 0xcd, 0xca, 0xac, 0xf9, 0x13, 0x83, 0xfa, 0x5a, 0x12, 0x42,
+	0xf6, 0x36, 0x14, 0x7b, 0x0a, 0x46, 0x0a, 0xf0, 0xf5, 0x73, 0x20, 0xbe, 0x3d, 0x63, 0xd1, 0x47,
+	0xac, 0x06, 0x73, 0x91, 0x39, 0x0a, 0xe6, 0xed, 0x19, 0x2b, 0x22, 0x6c, 0x98, 0xb0, 0x26, 0x4b,
+	0x86, 0x4d, 0x71, 0x2d, 0xf1, 0x09, 0x6c, 0x74, 0x90, 0xed, 0x3b, 0xa7, 0x7d, 0xcf, 0xe9, 0x98,
+	0xbf, 0xc9, 0xc3, 0x8d, 0xc4, 0x4e, 0x54, 0xbf, 0x28, 0x22, 0xae, 0xa6, 0x8a, 0x25, 0x4a, 0x53,
+	0x3e, 0x55, 0x9a, 0x6e, 0xc3, 0x12, 0xa9, 0x1d, 0x55, 0x28, 0x2c, 0x5f, 0x8b, 0x48, 0xdd, 0xa1,
+	0x3a, 0xf5, 0x69, 0x60, 0xc4, 0xe6, 0x8c, 0xc2, 0x9e, 0x27, 0x50, 0x1c, 0x16, 0xb3, 0x0a, 0xae,
+	0x3c, 0x56, 0x0b, 0x4a, 0x68, 0x03, 0x5e, 0xd1, 0xb9, 0xf9, 0xc0, 0x71, 0xfb, 0x54, 0xd7, 0x56,
+	0xe2, 0xec, 0x2d, 0xb9, 0x90, 0x5d, 0x05, 0xe7, 0xce, 0x5f, 0x05, 0x4b, 0xe7, 0xae, 0x82, 0xf2,
+	0x5a, 0x73, 0xec, 0x89, 0x36, 0xaf, 0xce, 0xe3, 0xb5, 0x46, 0xfd, 0x90, 0x69, 0x84, 0x42, 0xe5,
+	0xb1, 0x1d, 0xf0, 0x30, 0xa7, 0x08, 0x07, 0x3d, 0xc7, 0xfc, 0x35, 0xdd, 0xe4, 0xd2, 0xae, 0x63,
+	0x5f, 0x4c, 0x04, 0xd5, 0xad, 0x29, 0x41, 0xa5, 0xb9, 0x3a, 0x16, 0x55, 0x9f, 0x1f, 0x97, 0x81,
+	0x9c, 0x5e, 0x75, 0xb3, 0x83, 0x72, 0x26, 0xca, 0xfb, 0x8d, 0x75, 0x78, 0x33, 0x1d, 0x72, 0x02,
+	0x77, 0x19, 0xc7, 0xdc, 0x2f, 0xa2, 0x21, 0x5d, 0x5c, 0x91, 0x4b, 0x2c, 0xfb, 0x37, 0x61, 0xc1,
+	0x1d, 0x76, 0xf8, 0x73, 0xad, 0xe0, 0x83, 0x22, 0x9d, 0x51, 0xc8, 0xa7, 0xdc, 0x97, 0x7f, 0x3e,
+	0xee, 0xed, 0xb2, 0xf0, 0x5c, 0xf9, 0xd9, 0x5d, 0xa8, 0x6d, 0x62, 0x67, 0x77, 0x24, 0x9c, 0x71,
+	0x55, 0x5e, 0x05, 0xca, 0x1b, 0x15, 0x24, 0xb3, 0x78, 0xb7, 0x43, 0x8a, 0xbc, 0xdb, 0x7d, 0x09,
+	0x56, 0x04, 0x1f, 0x78, 0x21, 0x8f, 0x07, 0x66, 0x71, 0xaa, 0xc2, 0x15, 0x64, 0x8e, 0x45, 0xe6,
+	0x3a, 0x2c, 0x92, 0x00, 0xda, 0x1e, 0x13, 0xa0, 0x8c, 0x44, 0x74, 0xc3, 0x17, 0x72, 0x55, 0xc3,
+	0xfc, 0xbe, 0x11, 0x35, 0x72, 0x44, 0x6a, 0x3c, 0xd3, 0x00, 0x32, 0x4a, 0xea, 0x87, 0xd7, 0x2c,
+	0x32, 0x53, 0xea, 0x77, 0x81, 0xdb, 0x81, 0xc4, 0xa7, 0x9b, 0x68, 0xd0, 0xa5, 0x2e, 0x75, 0x67,
+	0xa5, 0xc2, 0xdf, 0xa8, 0x9a, 0xa1, 0x0a, 0x4d, 0x6f, 0x78, 0xec, 0x8a, 0x81, 0x73, 0xd4, 0x1f,
+	0xfb, 0xad, 0x95, 0x48, 0x8c, 0x4f, 0xe9, 0x6d, 0x38, 0xfb, 0xab, 0x46, 0x2a, 0x3f, 0xae, 0x45,
+	0x43, 0x08, 0x75, 0x2b, 0xdc, 0x9e, 0xa1, 0x31, 0x44, 0xed, 0x0f, 0x39, 0x28, 0x5e, 0x69, 0xdd,
+	0xfc, 0xaf, 0x8d, 0x10, 0x56, 0x87, 0x8a, 0xf4, 0x9d, 0x3f, 0x0a, 0x7a, 0xb6, 0xe7, 0xab, 0x49,
+	0x7e, 0xb5, 0xb4, 0x96, 0xaf, 0xcf, 0x5b, 0x4b, 0x5d, 0x37, 0xdc, 0x1f, 0x05, 0xbd, 0x3d, 0xa4,
+	0x6e, 0xdc, 0x85, 0x3b, 0xaa, 0x86, 0x90, 0xa1, 0xed, 0x89, 0x3f, 0x52, 0x95, 0xe4, 0x2f, 0x06,
+	0xac, 0x4e, 0xf1, 0x1c, 0x45, 0xdf, 0xcd, 0x74, 0xf4, 0x6d, 0xcf, 0xc4, 0xe3, 0xef, 0x0e, 0x2c,
+	0x11, 0x83, 0x74, 0xa1, 0x1b, 0xdd, 0xf4, 0xb7, 0x67, 0xac, 0x45, 0xa4, 0x3f, 0x46, 0xf2, 0x45,
+	0x8a, 0x86, 0x1e, 0xa8, 0x05, 0x3d, 0x50, 0x37, 0xee, 0x41, 0x7d, 0xba, 0x7d, 0xa8, 0xf6, 0xd8,
+	0xc0, 0x17, 0x54, 0x7d, 0x0e, 0xde, 0x1b, 0x39, 0xc1, 0xd5, 0x4f, 0x0e, 0x02, 0xb5, 0x4d, 0x2c,
+	0xb6, 0x90, 0xf0, 0xa4, 0xa3, 0x77, 0xa2, 0x59, 0xbd, 0x13, 0xb1, 0xd7, 0x61, 0x8e, 0x0f, 0x3b,
+	0x6a, 0xa9, 0xa8, 0x96, 0x8a, 0x7c, 0xd8, 0x91, 0x0b, 0xb7, 0xa0, 0x88, 0x9d, 0x96, 0x2e, 0x04,
+	0xfa, 0xb6, 0xb4, 0x96, 0xd1, 0xeb, 0x4b, 0x19, 0xbd, 0xfe, 0x69, 0xa1, 0x54, 0xa8, 0xcc, 0x8e,
+	0x47, 0x16, 0x2e, 0x16, 0x9b, 0x08, 0x98, 0x49, 0xb1, 0x21, 0x1b, 0x62, 0xc5, 0x06, 0x29, 0x52,
+	0x9f, 0xb3, 0x0a, 0x08, 0x8e, 0xe6, 0xac, 0xb4, 0x93, 0xcd, 0x9f, 0xd2, 0x50, 0x42, 0x46, 0xc2,
+	0xe9, 0xbe, 0x13, 0x4e, 0x46, 0x38, 0x67, 0xf6, 0xd9, 0x14, 0x7b, 0x23, 0xeb, 0xf4, 0xe6, 0x4b,
+	0x06, 0x1e, 0x4c, 0x4e, 0x6f, 0x44, 0xa8, 0xfd, 0xc0, 0xb8, 0xe2, 0x5a, 0xb2, 0x0e, 0x8b, 0x34,
+	0xdd, 0xa3, 0xb4, 0xa5, 0x63, 0x38, 0x12, 0x31, 0x6d, 0xc7, 0x67, 0x48, 0x55, 0xdf, 0x6c, 0xa5,
+	0x5b, 0x2a, 0x0b, 0xbf, 0x81, 0xe7, 0x90, 0xb8, 0xbd, 0x97, 0xd7, 0xcd, 0xcd, 0xbf, 0x1b, 0x50,
+	0x9b, 0x3c, 0xf6, 0x1c, 0x8c, 0x8e, 0x06, 0x5e, 0x67, 0xd4, 0xe7, 0x57, 0x3e, 0x30, 0xa5, 0x90,
+	0x8c, 0x0d, 0x4c, 0x91, 0x72, 0xd6, 0xc0, 0xf4, 0x06, 0xcc, 0x07, 0x91, 0x82, 0xd1, 0xbc, 0x74,
+	0x4c, 0xc8, 0x88, 0xf3, 0x62, 0x46, 0x9c, 0x9b, 0x7f, 0x34, 0xf0, 0x8e, 0x96, 0x32, 0xf8, 0xe3,
+	0x99, 0xc9, 0xa5, 0x6e, 0xc6, 0x85, 0xd4, 0xcd, 0xf8, 0x69, 0xa1, 0x94, 0xaf, 0x14, 0xac, 0xf4,
+	0x65, 0xfb, 0xd1, 0x3f, 0x17, 0xa0, 0x32, 0xd6, 0xe7, 0x80, 0x8b, 0x13, 0xb7, 0xcd, 0xd9, 0xb7,
+	0xa0, 0x92, 0x7c, 0xf0, 0x64, 0x37, 0xb5, 0x13, 0x66, 0xfa, 0xf5, 0xb6, 0xb6, 0x36, 0x9d, 0x01,
+	0x71, 0x31, 0xe7, 0x3f, 0x78, 0x51, 0x9f, 0x2d, 0x19, 0x35, 0xe3, 0x61, 0xb4, 0x43, 0xfc, 0x7d,
+	0x50, 0xdf, 0x21, 0xe3, 0xed, 0x53, 0xdf, 0x21, 0xeb, 0x69, 0x31, 0x63, 0x87, 0xf8, 0x33, 0x9d,
+	0xbe, 0x43, 0xc6, 0x93, 0xa2, 0xbe, 0x43, 0xd6, 0x0b, 0x5f, 0x7c, 0x87, 0xaf, 0xc1, 0xa2, 0xf6,
+	0x48, 0xc4, 0x6e, 0xa4, 0x11, 0x98, 0xbc, 0x83, 0xd5, 0x56, 0xa7, 0xac, 0x4e, 0x15, 0x3c, 0x7e,
+	0x8f, 0xd3, 0x05, 0x27, 0xdf, 0x0b, 0x75, 0xc1, 0xa9, 0x47, 0xbc, 0xb8, 0xe0, 0x77, 0x61, 0x49,
+	0x9f, 0xe5, 0x33, 0xed, 0xdb, 0xd4, 0x63, 0x47, 0xed, 0x13, 0xd3, 0x96, 0xd3, 0xb2, 0x1d, 0x58,
+	0x4e, 0xbc, 0xef, 0xb0, 0xf4, 0xd7, 0x3a, 0xda, 0x37, 0xa7, 0xae, 0xa7, 0xc4, 0xd7, 0x8d, 0x07,
+	0x06, 0x3b, 0x84, 0x72, 0x7c, 0x06, 0xce, 0xae, 0xc7, 0xbf, 0x4f, 0x0c, 0xef, 0x6b, 0x37, 0xb2,
+	0x17, 0xa7, 0x82, 0x32, 0x19, 0x48, 0xea, 0xa0, 0xa4, 0x06, 0xdd, 0x3a, 0x28, 0xe9, 0x39, 0x66,
+	0x06, 0x28, 0xb1, 0x7b, 0x94, 0x0e, 0x4a, 0xfa, 0xa6, 0xa7, 0x83, 0x92, 0x71, 0x01, 0x33, 0x17,
+	0x3e, 0x78, 0x51, 0x9f, 0x2b, 0x19, 0xb5, 0xfc, 0xc3, 0xc6, 0xc3, 0xba, 0xc1, 0xbe, 0x02, 0x30,
+	0x39, 0x60, 0xb1, 0x37, 0xd2, 0xc7, 0xe5, 0x48, 0x70, 0x2d, 0x6b, 0x89, 0x64, 0x96, 0xc7, 0x2a,
+	0xff, 0x28, 0x67, 0xb0, 0x11, 0x76, 0xd3, 0xd4, 0x99, 0x8d, 0xdd, 0x3a, 0xcf, 0x61, 0xbc, 0x76,
+	0xfb, 0x43, 0xb8, 0x32, 0xed, 0x78, 0x60, 0xb0, 0xdd, 0xc8, 0x92, 0x13, 0x2e, 0xc2, 0xa4, 0x25,
+	0xb1, 0xb9, 0x6d, 0xd2, 0x92, 0xf8, 0x68, 0x2e, 0x0e, 0x3e, 0xc9, 0xc3, 0x03, 0x88, 0x2e, 0x4f,
+	0x3b, 0xad, 0xe9, 0xf2, 0xf4, 0xf3, 0x4a, 0x5c, 0xde, 0x37, 0x31, 0x50, 0x26, 0x5d, 0x54, 0x0f,
+	0x94, 0xd4, 0x69, 0x42, 0x0f, 0x94, 0x74, 0xf3, 0x4d, 0x7a, 0xd2, 0xc5, 0x57, 0xa8, 0x44, 0x57,
+	0x61, 0x66, 0xba, 0xea, 0x25, 0x7b, 0x6c, 0x6d, 0xfd, 0x4c, 0x9e, 0x94, 0x29, 0x1b, 0x0f, 0xde,
+	0x95, 0x1f, 0xf4, 0x9d, 0xa3, 0x46, 0xdb, 0x1b, 0xdc, 0xc7, 0x3f, 0x3f, 0xe3, 0x89, 0xee, 0x7d,
+	0x14, 0x73, 0x5f, 0xfd, 0xaf, 0xce, 0xfd, 0xae, 0x47, 0xbf, 0xfd, 0xa3, 0xa3, 0xa2, 0x22, 0x7d,
+	0xf6, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x58, 0xd0, 0x22, 0xb8, 0xe8, 0x23, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/operations.proto b/proto/operations.proto
index b2d2d24e5..e781e9903 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -396,7 +396,8 @@ message UserSquashRequest {
   Repository repository = 1;
   User user = 2;
   string squash_id = 3;
-  bytes branch = 4;
+  reserved 4;
+  reserved "branch";
   string start_sha = 5;
   string end_sha = 6;
   User author = 7;
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index 0d3cb43cd..2d26ef15c 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -299,7 +299,6 @@ module GitalyServer
       author = Gitlab::Git::User.from_gitaly(request.author)
 
       squash_sha = repo.squash(user, request.squash_id,
-                               branch: request.branch,
                                start_sha: request.start_sha,
                                end_sha: request.end_sha,
                                author: author,
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index 2566ce4df..d443ceb77 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -383,7 +383,7 @@ module Gitlab
         end
       end
 
-      def squash(user, squash_id, branch:, start_sha:, end_sha:, author:, message:)
+      def squash(user, squash_id, start_sha:, end_sha:, author:, message:)
         worktree = Gitlab::Git::Worktree.new(path, SQUASH_WORKTREE_PREFIX, squash_id)
         env = git_env.merge(user.git_env).merge(
           'GIT_AUTHOR_NAME' => author.name,
@@ -394,7 +394,7 @@ module Gitlab
           %W[diff --name-only --diff-filter=ar --binary #{diff_range}]
         ).chomp
 
-        with_worktree(worktree, branch, sparse_checkout_files: diff_files, env: env) do
+        with_worktree(worktree, start_sha, sparse_checkout_files: diff_files, env: env) do
           # Apply diff of the `diff_range` to the worktree
           diff = run_git!(%W[diff --binary #{diff_range}])
           run_git!(%w[apply --index --3way --whitespace=nowarn], chdir: worktree.path, env: env, include_stderr: true) do |stdin|
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb
index 537adf5ad..b40bbcee9 100644
--- a/ruby/proto/gitaly/operations_pb.rb
+++ b/ruby/proto/gitaly/operations_pb.rb
@@ -223,7 +223,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :repository, :message, 1, "gitaly.Repository"
     optional :user, :message, 2, "gitaly.User"
     optional :squash_id, :string, 3
-    optional :branch, :bytes, 4
     optional :start_sha, :string, 5
     optional :end_sha, :string, 6
     optional :author, :message, 7, "gitaly.User"
diff --git a/ruby/spec/lib/gitlab/git/repository_spec.rb b/ruby/spec/lib/gitlab/git/repository_spec.rb
index 417f60501..216666e60 100644
--- a/ruby/spec/lib/gitlab/git/repository_spec.rb
+++ b/ruby/spec/lib/gitlab/git/repository_spec.rb
@@ -647,13 +647,11 @@ describe Gitlab::Git::Repository do # rubocop:disable Metrics/BlockLength
   describe '#squash' do
     let(:repository) { mutable_repository }
     let(:squash_id) { '1' }
-    let(:branch_name) { 'fix' }
     let(:start_sha) { '4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6' }
     let(:end_sha) { '12d65c8dd2b2676fa3ac47d955accc085a37a9c1' }
 
     subject do
       opts = {
-        branch: branch_name,
         start_sha: start_sha,
         end_sha: end_sha,
         author: user,