From bdb491e76441a323ecd02c4650e2d2bf6a15d495 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sat, 28 Nov 2020 21:59:32 +0000 Subject: [PATCH] Push HEAD instead of master when initialising repositories (#13719) (#13740) * 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 * Update modules/repository/init.go Co-authored-by: mrsdizzie Co-authored-by: mrsdizzie Co-authored-by: techknowlogick Co-authored-by: mrsdizzie Co-authored-by: techknowlogick --- modules/repository/init.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/repository/init.go b/modules/repository/init.go index 707f8f525..9df2cd42b 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) }