From ce8de3533485eed0c56059d6334a5031a73eed67 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sat, 11 May 2019 16:29:17 +0100 Subject: Remove local clones & make hooks run on merge/edit/upload (#6672) * Add options to git.Clone to make it more capable * Begin the process of removing the local copy and tidy up * Remove Wiki LocalCopy Checkouts * Remove the last LocalRepo helpers * Remove WithTemporaryFile * Enable push-hooks for these routes * Ensure tests cope with hooks Signed-off-by: Andrew Thornton * Remove Repository.LocalCopyPath() * Move temporary repo to use the standard temporary path * Fix the tests Signed-off-by: Andrew Thornton * Remove LocalWikiPath * Fix missing remove Signed-off-by: Andrew Thornton * Use AppURL for Oauth user link (#6894) * Use AppURL for Oauth user link Fix #6843 * Update oauth.go * Update oauth.go * internal/ssh: ignore env command totally (#6825) * ssh: ignore env command totally * Remove commented code Needed fix described in issue #6889 * Escape the commit message on issues update and title in telegram hook (#6901) * update sdk to latest (#6903) * improve description of branch protection (fix #6886) (#6906) The branch protection description text were not quite accurate. * Fix logging documentation (#6904) * ENABLE_MACARON_REDIRECT should be REDIRECT_MACARON_LOG * Allow DISABLE_ROUTER_LOG to be set in the [log] section * [skip ci] Updated translations via Crowdin * Move sdk structs to modules/structs (#6905) * move sdk structs to moduels/structs * fix tests * fix fmt * fix swagger * fix vendor --- modules/git/repo_branch.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/git/repo_branch.go') diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go index 83689ee9dc..116bdbee82 100644 --- a/modules/git/repo_branch.go +++ b/modules/git/repo_branch.go @@ -17,7 +17,7 @@ const BranchPrefix = "refs/heads/" // IsReferenceExist returns true if given reference exists in the repository. func IsReferenceExist(repoPath, name string) bool { - _, err := NewCommand("show-ref", "--verify", name).RunInDir(repoPath) + _, err := NewCommand("show-ref", "--verify", "--", name).RunInDir(repoPath) return err == nil } @@ -145,9 +145,9 @@ func (repo *Repository) DeleteBranch(name string, opts DeleteBranchOptions) erro } // CreateBranch create a new branch -func (repo *Repository) CreateBranch(branch, newBranch string) error { +func (repo *Repository) CreateBranch(branch, oldbranchOrCommit string) error { cmd := NewCommand("branch") - cmd.AddArguments(branch, newBranch) + cmd.AddArguments("--", branch, oldbranchOrCommit) _, err := cmd.RunInDir(repo.Path) -- cgit v1.2.3