fix issues

Author: denyskon

modules/structs/repo_file.go

@@ -87,6 +87,11 @@ type ChangeFilesOptions struct {
 	Files []*ChangeFileOperation `json:"files"`
 }
 
+// Branch returns branch name
+func (o *ChangeFilesOptions) Branch() string {
+	return o.FileOptions.BranchName
+}
+
 // FileOptionInterface provides a unified interface for the different file options
 type FileOptionInterface interface {
 	Branch() string

routers/api/v1/swagger/options.go

@@ -116,6 +116,9 @@ type swaggerParameterBodies struct {
 	// in:body
 	EditAttachmentOptions api.EditAttachmentOptions
 
+	// in:body
+	ChangeFilesOptions api.ChangeFilesOptions
+
 	// in:body
 	CreateFileOptions api.CreateFileOptions
 

routers/api/v1/swagger/repo.go

@@ -299,6 +299,7 @@ type swaggerFileResponse struct {
 // FileListResponse
 // swagger:response FileListResponse
 type swaggerFileListResponse struct {
+	// in: body
 	Body []api.FileResponse `json:"body"`
 }
 

services/repository/files/update.go

@@ -213,12 +213,10 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 			if err != nil {
 				return nil, err
 			}
-			if err := t.SetDefaultIndex(); err != nil {
-				return nil, err
-			}
 		default:
 			return nil, fmt.Errorf("Invalid file operation: %s %s", file.Operation, file.TreePath)
 		}
+
 		// If FromTreePath is not set, set it to the opts.TreePath
 		if file.TreePath != "" && file.FromTreePath == "" {
 			file.FromTreePath = file.TreePath
@@ -246,6 +244,15 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 			bom:          false,
 			executable:   false,
 		}
+	}
+
+	if hasOldBranch {
+		if err := t.SetDefaultIndex(); err != nil {
+			return nil, err
+		}
+	}
+
+	for _, file := range opts.Files {
 		if file.Operation == "delete" {
 			// Get the files in the index
 			filesInIndex, err := t.LsFiles(file.TreePath)