diff options
| author | zeripath <art27@cantab.net> | 2020-11-28 21:00:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 16:00:38 -0500 |
| commit | 911d370dad5dadaaaf2a637b920730af1673d61a (patch) | |
| tree | 16dbcb578601859e71a5fc06903a34a997573494 /modules/repository | |
| parent | 9c26dc1f3a742280baff4e9578545bc822016764 (diff) | |
| download | gitea-911d370dad5dadaaaf2a637b920730af1673d61a.tar.gz gitea-911d370dad5dadaaaf2a637b920730af1673d61a.zip | |
Push HEAD instead of master when initialising repositories (#13719)
* Push HEAD instead of master when initialising repositories
It is possible on modern gits to change the initial branch to something other than
master. This breaks initialising repositories because we assume that the initial
branch is going to be master unless specifically changed.
This PR simply bypasses this issue by pushing the HEAD rather than the master branch.
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Update modules/repository/init.go
Co-authored-by: mrsdizzie <info@mrsdizzie.com>
Co-authored-by: mrsdizzie <info@mrsdizzie.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'modules/repository')
| -rw-r--r-- | modules/repository/init.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/repository/init.go b/modules/repository/init.go index 37dc69a0a8..c94b44514d 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -162,10 +162,10 @@ func initRepoCommit(tmpPath string, repo *models.Repository, u *models.User, def defaultBranch = setting.Repository.DefaultBranch } - if stdout, err := git.NewCommand("push", "origin", "master:"+defaultBranch). + if stdout, err := git.NewCommand("push", "origin", "HEAD:"+defaultBranch). SetDescription(fmt.Sprintf("initRepoCommit (git push): %s", tmpPath)). RunInDirWithEnv(tmpPath, models.InternalPushingEnvironment(u, repo)); err != nil { - log.Error("Failed to push back to master: Stdout: %s\nError: %v", stdout, err) + log.Error("Failed to push back to HEAD: Stdout: %s\nError: %v", stdout, err) return fmt.Errorf("git push: %v", err) } |