From dbce7ee6a7245200e92a25c56ec9ff3403cfe0b8 Mon Sep 17 00:00:00 2001 From: Morgan Bazalgette Date: Fri, 26 Jan 2018 18:13:54 +0100 Subject: [PATCH 1/2] Keep same repo.ID on repo file updates --- models/repo_editor.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/models/repo_editor.go b/models/repo_editor.go index 1adaa2c9552b1..7e4598bd52325 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -86,8 +86,9 @@ type UpdateRepoFileOptions struct { // UpdateRepoFile adds or updates a file in repository. func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (err error) { - repoWorkingPool.CheckIn(com.ToStr(repo.ID)) - defer repoWorkingPool.CheckOut(com.ToStr(repo.ID)) + repoID := com.ToStr(repo.ID)) + repoWorkingPool.CheckIn(repoID) + defer repoWorkingPool.CheckOut(repoID) if err = repo.DiscardLocalRepoBranchChanges(opts.OldBranch); err != nil { return fmt.Errorf("DiscardLocalRepoBranchChanges [branch: %s]: %v", opts.OldBranch, err) From 21a15536b7060376c302c8991d934d8e1a9db803 Mon Sep 17 00:00:00 2001 From: Morgan Bazalgette Date: Fri, 26 Jan 2018 18:43:37 +0100 Subject: [PATCH 2/2] ... wooops drone pls --- models/repo_editor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo_editor.go b/models/repo_editor.go index 7e4598bd52325..6e7740175caf7 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -86,7 +86,7 @@ type UpdateRepoFileOptions struct { // UpdateRepoFile adds or updates a file in repository. func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (err error) { - repoID := com.ToStr(repo.ID)) + repoID := com.ToStr(repo.ID) repoWorkingPool.CheckIn(repoID) defer repoWorkingPool.CheckOut(repoID)