diff options
| author | Sandro Santilli <strk@kbt.io> | 2016-11-07 17:33:03 +0100 |
|---|---|---|
| committer | Sandro Santilli <strk@kbt.io> | 2016-11-07 17:33:03 +0100 |
| commit | f14232d2e982b7e6021df1b3c001269fa652632f (patch) | |
| tree | 61c0de365071edc1adb2b85068ac950b7664def8 /models | |
| parent | 60c82a87805821ad6eaf5aeb58a3a266b56a30ff (diff) | |
| download | gitea-f14232d2e982b7e6021df1b3c001269fa652632f.tar.gz gitea-f14232d2e982b7e6021df1b3c001269fa652632f.zip | |
This one I overlooked before
Diffstat (limited to 'models')
| -rw-r--r-- | models/git_diff.go | 8 | ||||
| -rw-r--r-- | models/repo.go | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/models/git_diff.go b/models/git_diff.go index ffe9d9e81d..8c1b47ab60 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -34,7 +34,7 @@ const ( DiffLinePlain DiffLineType = iota + 1 DiffLineAdd DiffLineDel - DIFF_LINE_SECTION + DiffLineSection ) type DiffFileType uint8 @@ -43,7 +43,7 @@ const ( DiffFileAdd DiffFileType = iota + 1 DiffFileChange DiffFileDel - DIFF_FILE_RENAME + DiffFileRename ) type DiffLine struct { @@ -273,7 +273,7 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (* curSection = &DiffSection{} curFile.Sections = append(curFile.Sections, curSection) ss := strings.Split(line, "@@") - diffLine := &DiffLine{Type: DIFF_LINE_SECTION, Content: line} + diffLine := &DiffLine{Type: DiffLineSection, Content: line} curSection.Lines = append(curSection.Lines, diffLine) // Parse line number. @@ -362,7 +362,7 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (* case strings.HasPrefix(line, "index"): curFile.Type = DiffFileChange case strings.HasPrefix(line, "similarity index 100%"): - curFile.Type = DIFF_FILE_RENAME + curFile.Type = DiffFileRename curFile.IsRenamed = true curFile.OldName = curFile.Name curFile.Name = b diff --git a/models/repo.go b/models/repo.go index bf34e97d09..5c5af32f4c 100644 --- a/models/repo.go +++ b/models/repo.go @@ -35,7 +35,7 @@ import ( ) const ( - _TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n" + tplUpdateHook = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n" ) var repoWorkingPool = sync.NewExclusivePool() @@ -706,7 +706,7 @@ func cleanUpMigrateGitConfig(configPath string) error { func createUpdateHook(repoPath string) error { return git.SetUpdateHook(repoPath, - fmt.Sprintf(_TPL_UPDATE_HOOK, setting.ScriptType, "\""+setting.AppPath+"\"", setting.CustomConf)) + fmt.Sprintf(tplUpdateHook, setting.ScriptType, "\""+setting.AppPath+"\"", setting.CustomConf)) } // Finish migrating repository and/or wiki with things that don't need to be done for mirrors. |