From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 24 Jun 2017 07:18:57 +0000 (+0200)
Subject: releaser: Improve docs submodule handling
X-Git-Tag: v0.25~45
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3aade089;p=brevno-suite%2Fhugo

releaser: Improve docs submodule handling

Still not optimal.
---

diff --git a/releaser/releaser.go b/releaser/releaser.go
index 0823cd04..39a785da 100644
--- a/releaser/releaser.go
+++ b/releaser/releaser.go
@@ -142,9 +142,17 @@ func (r *ReleaseHandler) Run() error {
 	}
 
 	if r.shouldPrepareVersions() {
-		// Make sure the docs submodule is up to date.
-		if _, err := git("submodule", "update", "--remote", "--merge"); err != nil {
-			return err
+		if newVersion.PatchLevel == 0 {
+			// Make sure the docs submodule is up to date.
+			// TODO(bep) improve this. Maybe it was not such a good idea to do
+			// this in the sobmodule directly.
+			if _, err := git("submodule", "update", "--init"); err != nil {
+				return err
+			}
+			//git submodule update
+			if _, err := git("submodule", "update", "--remote", "--merge"); err != nil {
+				return err
+			}
 		}
 		// TODO(bep) the above may not have changed anything.
 		if _, err := git("commit", "-a", "-m", fmt.Sprintf("%s Update /docs [ci skip]", commitPrefix)); err != nil {