fix push (#1076)
This commit is contained in:
parent
136e6beb0f
commit
9084bdd863
1 changed files with 4 additions and 1 deletions
|
@ -76,6 +76,9 @@ func runHookPreReceive(c *cli.Context) error {
|
||||||
// the environment setted on serv command
|
// the environment setted on serv command
|
||||||
repoID, _ := strconv.ParseInt(os.Getenv(models.ProtectedBranchRepoID), 10, 64)
|
repoID, _ := strconv.ParseInt(os.Getenv(models.ProtectedBranchRepoID), 10, 64)
|
||||||
isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true")
|
isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true")
|
||||||
|
username := os.Getenv(models.EnvRepoUsername)
|
||||||
|
reponame := os.Getenv(models.EnvRepoName)
|
||||||
|
repoPath := models.RepoPath(username, reponame)
|
||||||
|
|
||||||
buf := bytes.NewBuffer(nil)
|
buf := bytes.NewBuffer(nil)
|
||||||
scanner := bufio.NewScanner(os.Stdin)
|
scanner := bufio.NewScanner(os.Stdin)
|
||||||
|
@ -113,7 +116,7 @@ func runHookPreReceive(c *cli.Context) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check force push
|
// Check force push
|
||||||
output, err := git.NewCommand("rev-list", oldCommitID, "^"+newCommitID).Run()
|
output, err := git.NewCommand("rev-list", oldCommitID, "^"+newCommitID).RunInDir(repoPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fail("Internal error", "Fail to detect force push: %v", err)
|
fail("Internal error", "Fail to detect force push: %v", err)
|
||||||
} else if len(output) > 0 {
|
} else if len(output) > 0 {
|
||||||
|
|
Loading…
Reference in a new issue