releaser: Adjustments

diff --git a/releaser/git.go b/releaser/git.go
index 5cfce546465387c04bd58e0bd351f099c86a4f3d..2d49d21026588bc67be414577880cbf2c39eb93e 100644 (file)
--- a/releaser/git.go
+++ b/releaser/git.go
@@ -29,7 +29,6 @@ const (
        templateChanges = "templateChanges"
        coreChanges     = "coreChanges"
        outChanges      = "outChanges"
-       docsChanges     = "docsChanges"
        otherChanges    = "otherChanges"
 )
 
@@ -91,8 +90,6 @@ func gitInfosToChangeLog(infos gitInfos) *changeLog {
                        category = notesChanges
                } else if regexp.MustCompile("(?i)tpl|tplimpl:|layout").MatchString(los) {
                        category = templateChanges
-               } else if regexp.MustCompile("(?i)docs?:|documentation:").MatchString(los) {
-                       category = docsChanges
                } else if regexp.MustCompile("(?i)hugolib:").MatchString(los) {
                        category = coreChanges
                } else if regexp.MustCompile("(?i)out(put)?:|media:|Output|Media").MatchString(los) {
@@ -247,7 +244,7 @@ func getGitInfosBefore(ref, tag string, remote bool) (gitInfos, error) {
 }
 
 // Ignore autogenerated commits etc. in change log. This is a regexp.
-const ignoredCommits = "releaser?:|snapcraft:"
+const ignoredCommits = "releaser?:|snapcraft:|Merge commit|Squashed|Revert"
 
 func gitLogBefore(ref, tag string) (string, error) {
        var prevTag string

diff --git a/releaser/releasenotes_writer.go b/releaser/releasenotes_writer.go
index ced9254af863ec3d93ce36dc6d04989d24ef415b..84c8450e609526b5916305344262be13b89a7593 100644 (file)
--- a/releaser/releasenotes_writer.go
+++ b/releaser/releasenotes_writer.go
@@ -75,7 +75,6 @@ Hugo now has:
 {{ $tmplChanges := index . "templateChanges" -}}
 {{- $outChanges := index . "outChanges" -}}
 {{- $coreChanges := index . "coreChanges" -}}
-{{- $docsChanges := index . "docsChanges" -}}
 {{- $otherChanges := index . "otherChanges" -}}
 {{- with $tmplChanges -}}
 ### Templates
@@ -89,10 +88,6 @@ Hugo now has:
 ### Core
 {{ template "change-section" . }}
 {{- end -}}
-{{- with $docsChanges -}}
-### Docs
-{{ template "change-section"  . }}
-{{- end -}}
 {{- with $otherChanges -}}
 ### Other
 {{ template "change-section"  . }}

diff --git a/releaser/releaser.go b/releaser/releaser.go
index aeca47df2a532fdf9979a1e4839b8dbbf892543c..ff44bd25c0c3f7c38984c382ef0b2a1d930ddea2 100644 (file)
--- a/releaser/releaser.go
+++ b/releaser/releaser.go
@@ -24,6 +24,7 @@ import (
        "os/exec"
        "path/filepath"
        "regexp"
+       "strings"
 
        "github.com/gohugoio/hugo/helpers"
 )
@@ -84,7 +85,7 @@ func New(version string, step int, skipPublish, try bool) *ReleaseHandler {
 
        if try {
                rh.git = func(args ...string) (string, error) {
-                       fmt.Println("git", args)
+                       fmt.Println("git", strings.Join(args, " "))
                        return "", nil
                }
        } else {