GitButler Integration Commit

This is an integration commit for the virtual branches that GitButler is tracking.

Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily. 

If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.

Here are the branches that are currently applied:
 - update-generate-uuid-func-max-length-and-gofmt (refs/gitbutler/update-generate-uuid-func-max-length-and-gofmt)
   branch head: dc83185f32df45a9a97d857adcaca0e3e99f8c3b

Your previous branch was: d28cd0d

The sha for that commit was: d28cd0d

For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch

Author: gitbutler-client

Diff for: Client/auth/auth.go

@@ -1,13 +1,14 @@
 package auth
 
 import (
-	"strings"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"net/http"
+	"os"
+	"strings"
+
 	environment "github.com/CoreViewInc/CoreNiko/environment"
 	shared "github.com/CoreViewInc/CoreNiko/shared"
 )
@@ -157,4 +158,4 @@ func ReadEncodedCredentialsFromFile() (string, string, error) {
 	}
 
 	return "", "", fmt.Errorf("no credentials found in Docker config.json")
-}
+}

Diff for: Client/cmd/docker.go

@@ -4,10 +4,11 @@ import (
 	"archive/tar"
 	"compress/gzip"
 	"fmt"
-	"github.com/spf13/afero"
 	"io"
 	"os"
 	"path/filepath"
+
+	"github.com/spf13/afero"
 )
 
 type Compressor struct {
@@ -83,4 +84,4 @@ func (c *Compressor) Compress(outputPath string) error {
 	}
 
 	return nil
-}
+}