From 6cf6fecb64b71eaa9de78f66b5dee5a2e84371cb Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 19:13:41 +1000
Subject: [PATCH 01/34] refactor getting branches

---
 gitcommands.go | 88 ++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/gitcommands.go b/gitcommands.go
index 50c1f2a9f..c889f0759 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"regexp"
 	"runtime"
 	"strings"
 	"time"
@@ -164,8 +165,7 @@ func withPadding(str string, padding int) string {
 	return str + strings.Repeat(" ", padding-len(str))
 }
 
-func branchFromLine(line string, index int) Branch {
-	recency, name := branchStringParts(line)
+func branchFromLine(recency, name string, index int) Branch {
 	branchType, branchBase, colourAttr := branchPropertiesFromName(name)
 	if index == 0 {
 		recency = "  *"
@@ -181,28 +181,19 @@ func branchFromLine(line string, index int) Branch {
 }
 
 func getGitBranches() []Branch {
-	branches := make([]Branch, 0)
 	// check if there are any branches
 	branchCheck, _ := runCommand("git branch")
 	if branchCheck == "" {
-		return append(branches, branchFromLine("master", 0))
-	}
-	if rawString, err := runDirectCommand(getBranchesCommand); err == nil {
-		branchLines := splitLines(rawString)
-		for i, line := range branchLines {
-			branches = append(branches, branchFromLine(line, i))
-		}
-	} else {
-		// TODO: DRY this up
-		branches = append(branches, branchFromLine(gitCurrentBranchName(), 0))
+		return []Branch{branchFromLine("", gitCurrentBranchName(), 0)}
 	}
+	branches := getBranches()
 	branches = getAndMergeFetchedBranches(branches)
 	return branches
 }
 
-func branchAlreadyStored(branchLine string, branches []Branch) bool {
-	for _, branch := range branches {
-		if branch.Name == branchLine {
+func branchAlreadyStored(branchName string, branches []Branch) bool {
+	for _, existingBranch := range branches {
+		if existingBranch.Name == branchName {
 			return true
 		}
 	}
@@ -225,7 +216,7 @@ func getAndMergeFetchedBranches(branches []Branch) []Branch {
 		if branchAlreadyStored(line, branches) {
 			continue
 		}
-		branches = append(branches, branchFromLine(line, len(branches)))
+		branches = append(branches, branchFromLine("", line, len(branches)))
 	}
 	return branches
 }
@@ -545,33 +536,38 @@ func gitCurrentBranchName() string {
 	return strings.TrimSpace(branchName)
 }
 
-const getBranchesCommand = `set -e
-git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD | {
-  seen=":"
-  git_dir="$(git rev-parse --git-dir)"
-  while read line; do
-    date="${line%%|*}"
-    branch="${line##* }"
-    if ! [[ $seen == *:"${branch}":* ]]; then
-      seen="${seen}${branch}:"
-      if [ -f "${git_dir}/refs/heads/${branch}" ]; then
-        printf "%s\t%s\n" "$date" "$branch"
-      fi
-    fi
-  done \
-  | sed 's/ months /m /g' \
-  | sed 's/ month /m /g' \
-  | sed 's/ days /d /g' \
-  | sed 's/ day /d /g' \
-  | sed 's/ weeks /w /g' \
-  | sed 's/ week /w /g' \
-  | sed 's/ hours /h /g' \
-  | sed 's/ hour /h /g' \
-  | sed 's/ minutes /m /g' \
-  | sed 's/ minute /m /g' \
-  | sed 's/ seconds /s /g' \
-  | sed 's/ second /s /g' \
-  | sed 's/ago//g' \
-  | tr -d ' '
+func getBranches() []Branch {
+	rawString, _ := runDirectCommand("git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD")
+
+	branches := make([]Branch, 0)
+	branchLines := splitLines(rawString)
+	for i, line := range branchLines {
+		r := regexp.MustCompile("\\|.*\\s")
+		line = r.ReplaceAllString(line, " ")
+		words := strings.Split(line, " ")
+		timeNumber := words[0]
+		timeUnit := words[1]
+		branchName := words[3]
+
+		if branchAlreadyStored(branchName, branches) {
+			continue
+		}
+
+		r = regexp.MustCompile("s$")
+		timeUnit = r.ReplaceAllString(timeUnit, "")
+		timeUnitMap := map[string]string{
+			"hour":   "h",
+			"minute": "m",
+			"second": "s",
+			"week":   "w",
+			"year":   "y",
+			"day":    "d",
+			"month":  "m",
+		}
+		timeUnit = timeUnitMap[timeUnit]
+
+		branch := branchFromLine(timeNumber+timeUnit, branchName, i)
+		branches = append(branches, branch)
+	}
+	return branches
 }
-`

From c4f3637e217cef1521fa98f354a244888040f0b0 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 19:16:54 +1000
Subject: [PATCH 02/34] better function name

---
 gitcommands.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitcommands.go b/gitcommands.go
index c889f0759..ee0fd9a33 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -165,7 +165,7 @@ func withPadding(str string, padding int) string {
 	return str + strings.Repeat(" ", padding-len(str))
 }
 
-func branchFromLine(recency, name string, index int) Branch {
+func constructBranch(recency, name string, index int) Branch {
 	branchType, branchBase, colourAttr := branchPropertiesFromName(name)
 	if index == 0 {
 		recency = "  *"
@@ -184,7 +184,7 @@ func getGitBranches() []Branch {
 	// check if there are any branches
 	branchCheck, _ := runCommand("git branch")
 	if branchCheck == "" {
-		return []Branch{branchFromLine("", gitCurrentBranchName(), 0)}
+		return []Branch{constructBranch("", gitCurrentBranchName(), 0)}
 	}
 	branches := getBranches()
 	branches = getAndMergeFetchedBranches(branches)
@@ -216,7 +216,7 @@ func getAndMergeFetchedBranches(branches []Branch) []Branch {
 		if branchAlreadyStored(line, branches) {
 			continue
 		}
-		branches = append(branches, branchFromLine("", line, len(branches)))
+		branches = append(branches, constructBranch("", line, len(branches)))
 	}
 	return branches
 }
@@ -566,7 +566,7 @@ func getBranches() []Branch {
 		}
 		timeUnit = timeUnitMap[timeUnit]
 
-		branch := branchFromLine(timeNumber+timeUnit, branchName, i)
+		branch := constructBranch(timeNumber+timeUnit, branchName, i)
 		branches = append(branches, branch)
 	}
 	return branches

From a1aa031252d039c4541ad3049469028cd739c78b Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 19:20:27 +1000
Subject: [PATCH 03/34] revert to using bash instead of sh

---
 gitcommands.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitcommands.go b/gitcommands.go
index ee0fd9a33..668254cb8 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -117,7 +117,7 @@ func platformShell() (string, string) {
 	if runtime.GOOS == "windows" {
 		return "cmd", "/c"
 	}
-	return "sh", "-c"
+	return "bash", "-c"
 }
 
 func runDirectCommand(command string) (string, error) {

From c8bacb418637ec5585ac3c3dace78abf5d9a02bb Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 19:23:02 +1000
Subject: [PATCH 04/34] refactor

---
 gitcommands.go | 119 +++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/gitcommands.go b/gitcommands.go
index 668254cb8..4e6b043ed 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -165,62 +165,6 @@ func withPadding(str string, padding int) string {
 	return str + strings.Repeat(" ", padding-len(str))
 }
 
-func constructBranch(recency, name string, index int) Branch {
-	branchType, branchBase, colourAttr := branchPropertiesFromName(name)
-	if index == 0 {
-		recency = "  *"
-	}
-	colour := color.New(colourAttr)
-	displayString := withPadding(recency, 4) + coloredString(name, colour)
-	return Branch{
-		Name:          name,
-		Type:          branchType,
-		BaseBranch:    branchBase,
-		DisplayString: displayString,
-	}
-}
-
-func getGitBranches() []Branch {
-	// check if there are any branches
-	branchCheck, _ := runCommand("git branch")
-	if branchCheck == "" {
-		return []Branch{constructBranch("", gitCurrentBranchName(), 0)}
-	}
-	branches := getBranches()
-	branches = getAndMergeFetchedBranches(branches)
-	return branches
-}
-
-func branchAlreadyStored(branchName string, branches []Branch) bool {
-	for _, existingBranch := range branches {
-		if existingBranch.Name == branchName {
-			return true
-		}
-	}
-	return false
-}
-
-// here branches contains all the branches that we've checked out, along with
-// the recency. In this function we append the branches that are in our heads
-// directory i.e. things we've fetched but haven't necessarily checked out.
-// Worth mentioning this has nothing to do with the 'git merge' operation
-func getAndMergeFetchedBranches(branches []Branch) []Branch {
-	rawString, err := runDirectCommand("git branch --sort=-committerdate --no-color")
-	if err != nil {
-		return branches
-	}
-	branchLines := splitLines(rawString)
-	for _, line := range branchLines {
-		line = strings.Replace(line, "* ", "", -1)
-		line = strings.TrimSpace(line)
-		if branchAlreadyStored(line, branches) {
-			continue
-		}
-		branches = append(branches, constructBranch("", line, len(branches)))
-	}
-	return branches
-}
-
 // TODO: DRY up this function and getGitBranches
 func getGitStashEntries() []StashEntry {
 	stashEntries := make([]StashEntry, 0)
@@ -537,9 +481,12 @@ func gitCurrentBranchName() string {
 }
 
 func getBranches() []Branch {
-	rawString, _ := runDirectCommand("git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD")
-
 	branches := make([]Branch, 0)
+	rawString, err := runDirectCommand("git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD")
+	if err != nil {
+		return branches
+	}
+
 	branchLines := splitLines(rawString)
 	for i, line := range branchLines {
 		r := regexp.MustCompile("\\|.*\\s")
@@ -571,3 +518,59 @@ func getBranches() []Branch {
 	}
 	return branches
 }
+
+func constructBranch(recency, name string, index int) Branch {
+	branchType, branchBase, colourAttr := branchPropertiesFromName(name)
+	if index == 0 {
+		recency = "  *"
+	}
+	colour := color.New(colourAttr)
+	displayString := withPadding(recency, 4) + coloredString(name, colour)
+	return Branch{
+		Name:          name,
+		Type:          branchType,
+		BaseBranch:    branchBase,
+		DisplayString: displayString,
+	}
+}
+
+func getGitBranches() []Branch {
+	// check if there are any branches
+	branchCheck, _ := runCommand("git branch")
+	if branchCheck == "" {
+		return []Branch{constructBranch("", gitCurrentBranchName(), 0)}
+	}
+	branches := getBranches()
+	branches = getAndMergeFetchedBranches(branches)
+	return branches
+}
+
+func branchAlreadyStored(branchName string, branches []Branch) bool {
+	for _, existingBranch := range branches {
+		if existingBranch.Name == branchName {
+			return true
+		}
+	}
+	return false
+}
+
+// here branches contains all the branches that we've checked out, along with
+// the recency. In this function we append the branches that are in our heads
+// directory i.e. things we've fetched but haven't necessarily checked out.
+// Worth mentioning this has nothing to do with the 'git merge' operation
+func getAndMergeFetchedBranches(branches []Branch) []Branch {
+	rawString, err := runDirectCommand("git branch --sort=-committerdate --no-color")
+	if err != nil {
+		return branches
+	}
+	branchLines := splitLines(rawString)
+	for _, line := range branchLines {
+		line = strings.Replace(line, "* ", "", -1)
+		line = strings.TrimSpace(line)
+		if branchAlreadyStored(line, branches) {
+			continue
+		}
+		branches = append(branches, constructBranch("", line, len(branches)))
+	}
+	return branches
+}

From 2b37c9b19c8f55c56985961db18ae83c540001d0 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 19:26:47 +1000
Subject: [PATCH 05/34] ensure current branch is on top of the branch list

---
 gitcommands.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gitcommands.go b/gitcommands.go
index 4e6b043ed..774a821f1 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -541,6 +541,9 @@ func getGitBranches() []Branch {
 		return []Branch{constructBranch("", gitCurrentBranchName(), 0)}
 	}
 	branches := getBranches()
+	if len(branches) == 0 {
+		branches = append(branches, constructBranch("", gitCurrentBranchName(), 0))
+	}
 	branches = getAndMergeFetchedBranches(branches)
 	return branches
 }

From 232e1c74e45a9fe801137eb0805c669a771d22c1 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 19:31:19 +1000
Subject: [PATCH 06/34] refactor into smaller functions

---
 gitcommands.go | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/gitcommands.go b/gitcommands.go
index 774a821f1..3039501b8 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -480,6 +480,30 @@ func gitCurrentBranchName() string {
 	return strings.TrimSpace(branchName)
 }
 
+// A line will have the form '10 days ago master' so we need to strip out the
+// useful information from that into timeNumber, timeUnit, and branchName
+func branchInfoFromLine(line string) (string, string, string) {
+	r := regexp.MustCompile("\\|.*\\s")
+	line = r.ReplaceAllString(line, " ")
+	words := strings.Split(line, " ")
+	return words[0], words[1], words[3]
+}
+
+func abbreviatedTimeUnit(timeUnit string) string {
+	r := regexp.MustCompile("s$")
+	timeUnit = r.ReplaceAllString(timeUnit, "")
+	timeUnitMap := map[string]string{
+		"hour":   "h",
+		"minute": "m",
+		"second": "s",
+		"week":   "w",
+		"year":   "y",
+		"day":    "d",
+		"month":  "m",
+	}
+	return timeUnitMap[timeUnit]
+}
+
 func getBranches() []Branch {
 	branches := make([]Branch, 0)
 	rawString, err := runDirectCommand("git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD")
@@ -489,30 +513,13 @@ func getBranches() []Branch {
 
 	branchLines := splitLines(rawString)
 	for i, line := range branchLines {
-		r := regexp.MustCompile("\\|.*\\s")
-		line = r.ReplaceAllString(line, " ")
-		words := strings.Split(line, " ")
-		timeNumber := words[0]
-		timeUnit := words[1]
-		branchName := words[3]
+		timeNumber, timeUnit, branchName := branchInfoFromLine(line)
+		timeUnit = abbreviatedTimeUnit(timeUnit)
 
 		if branchAlreadyStored(branchName, branches) {
 			continue
 		}
 
-		r = regexp.MustCompile("s$")
-		timeUnit = r.ReplaceAllString(timeUnit, "")
-		timeUnitMap := map[string]string{
-			"hour":   "h",
-			"minute": "m",
-			"second": "s",
-			"week":   "w",
-			"year":   "y",
-			"day":    "d",
-			"month":  "m",
-		}
-		timeUnit = timeUnitMap[timeUnit]
-
 		branch := constructBranch(timeNumber+timeUnit, branchName, i)
 		branches = append(branches, branch)
 	}

From c81922f8cfa2a95fa356639c460968bc27a9bf71 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 19:32:25 +1000
Subject: [PATCH 07/34] rename recency to prefix

---
 gitcommands.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitcommands.go b/gitcommands.go
index 3039501b8..fe2b7746f 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -526,13 +526,13 @@ func getBranches() []Branch {
 	return branches
 }
 
-func constructBranch(recency, name string, index int) Branch {
+func constructBranch(prefix, name string, index int) Branch {
 	branchType, branchBase, colourAttr := branchPropertiesFromName(name)
 	if index == 0 {
-		recency = "  *"
+		prefix = "  *"
 	}
 	colour := color.New(colourAttr)
-	displayString := withPadding(recency, 4) + coloredString(name, colour)
+	displayString := withPadding(prefix, 4) + coloredString(name, colour)
 	return Branch{
 		Name:          name,
 		Type:          branchType,

From 50e4f74350b5ffd23cdb20e1165b49726afcd447 Mon Sep 17 00:00:00 2001
From: Rogers <rogers.chen@cardinfolink.com>
Date: Tue, 7 Aug 2018 19:04:41 +0800
Subject: [PATCH 08/34] fix: use createErrorPanel in handleIgnoreFile

---
 files_panel.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files_panel.go b/files_panel.go
index a69deaa25..7e0ed58d5 100644
--- a/files_panel.go
+++ b/files_panel.go
@@ -100,7 +100,7 @@ func handleFileRemove(g *gocui.Gui, v *gocui.View) error {
 func handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
 	file, err := getSelectedFile(g)
 	if err != nil {
-		return err
+		return createErrorPanel(g, err.Error())
 	}
 	if file.Tracked {
 		return createErrorPanel(g, "Cannot ignore tracked files")

From acae855ace3973468fe697c9c4437bd0b76a705d Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 21:15:06 +1000
Subject: [PATCH 09/34] initial travis config

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..19b8e70e3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+  language: go
+  go:
+    - "1.10"

From 138a5d86edcbad59a3d5c8c3e36ae33bbfa56120 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 21:32:51 +1000
Subject: [PATCH 10/34] attempt at automatic binary releases

---
 .travis.yml | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 19b8e70e3..decc28a97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,33 @@
-  language: go
-  go:
-    - "1.10"
+language: go
+sudo: false
+matrix:
+  include:
+  - go: 1.x
+    env: LATEST=true
+  - go: 1.5
+  - go: 1.6
+  - go: 1.7
+  - go: tip
+  allow_failures:
+  - go: tip
+install:
+-
+script:
+- go get -t -v ./...
+- diff -u <(echo -n) <(gofmt -d .)
+- go vet $(go list ./... | grep -v /vendor/)
+- if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.."
+  -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi
+deploy:
+  provider: releases
+  skip_cleanup: true
+  api_key:
+    secure: TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA=
+  file:
+  - lazygit.windows.amd64.exe
+  - lazygit.darwin.amd64
+  - lazygit.linux.amd64
+  on:
+    repo: jesseduffield/lazygit
+    tags: true
+    condition: $LATEST = true

From 6925ceeb6e68fd65f217f5d9633b29e0b2b83f95 Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Tue, 7 Aug 2018 13:42:39 +0200
Subject: [PATCH 11/34] set minimal ubuntu version supported by ppa

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fcd651684..f638fbd00 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Please note:
 If you get an error claiming that lazygit cannot be found or is not defined, you may need to add `~/go/bin` to your $PATH (MacOS/Linux), or `%HOME%\go\bin` (Windows)
 
 ### Ubuntu
-Packages for Ubuntu 14.04 and up are available via Launchpad PPA.
+Packages for Ubuntu 16.04 and up are available via Launchpad PPA.
 
 They are built daily, straight from master branch.
 

From ee7fad1433920a67d1cbc4cd6e8a2f1e8bccb959 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 21:44:26 +1000
Subject: [PATCH 12/34] update travis

---
 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index decc28a97..8fd37cc0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: go
 sudo: false
+env:
+  - DEP_VERSION="0.5.0"
 matrix:
   include:
   - go: 1.x
@@ -10,10 +12,16 @@ matrix:
   - go: tip
   allow_failures:
   - go: tip
+before_install:
+  # Download the binary to bin folder in $GOPATH
+  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
+  # Make the binary executable
+  - chmod +x $GOPATH/bin/dep
+  - dep ensure
 install:
--
+  -
 script:
-- go get -t -v ./...
+# - go get -v ./...
 - diff -u <(echo -n) <(gofmt -d .)
 - go vet $(go list ./... | grep -v /vendor/)
 - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.."

From fbd377606a229091cc7785440cf0046110771794 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 21:53:31 +1000
Subject: [PATCH 13/34] remove older go versions

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8fd37cc0a..888c25bba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ matrix:
   include:
   - go: 1.x
     env: LATEST=true
-  - go: 1.5
-  - go: 1.6
   - go: 1.7
   - go: tip
   allow_failures:

From abfbd59d67727e1be4aa18ad7ad3565b3f252f57 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 21:55:55 +1000
Subject: [PATCH 14/34] try with sudo

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 888c25bba..46e9e149a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: go
-sudo: false
+sudo: true
 env:
   - DEP_VERSION="0.5.0"
 matrix:

From 3dafb78b1d8d41713136ce7e592cf441a1ea4c42 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 21:58:10 +1000
Subject: [PATCH 15/34] change liniux platform

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46e9e149a..b600c6a76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: go
-sudo: true
+sudo: false
 env:
   - DEP_VERSION="0.5.0"
 matrix:
@@ -12,7 +12,7 @@ matrix:
   - go: tip
 before_install:
   # Download the binary to bin folder in $GOPATH
-  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
+  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
   - dep ensure

From 3c82edb3017d42844018d8b58eb4516213aa7d64 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:02:34 +1000
Subject: [PATCH 16/34] comment out failing build steps

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b600c6a76..ecdf94a2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ install:
   -
 script:
 # - go get -v ./...
-- diff -u <(echo -n) <(gofmt -d .)
-- go vet $(go list ./... | grep -v /vendor/)
+# - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory
+# - go vet $(go list ./... | grep -v /vendor/)
 - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.."
   -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi
 deploy:

From 4e8f909141c1f8ec28f797ef03eda668e6ee9643 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:05:23 +1000
Subject: [PATCH 17/34] juse use go 1.7

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ecdf94a2c..13d96ad7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,8 @@ env:
   - DEP_VERSION="0.5.0"
 matrix:
   include:
-  - go: 1.x
-    env: LATEST=true
   - go: 1.7
+    env: LATEST=true
   - go: tip
   allow_failures:
   - go: tip

From b715236c0a08df89b8e687499bf15e93096f17c9 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:13:42 +1000
Subject: [PATCH 18/34] get gox

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 13d96ad7d..166c5524d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ before_install:
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
   - dep ensure
+  - go get github.com/mitchellh/gox
 install:
   -
 script:

From 75e1a2d62f4f56eba1ad388d373703be41086bdf Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:14:30 +1000
Subject: [PATCH 19/34] support other go again

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 166c5524d..5cd5575d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,9 @@ env:
   - DEP_VERSION="0.5.0"
 matrix:
   include:
-  - go: 1.7
+  - go: 1.X
     env: LATEST=true
+  - go: 1.7
   - go: tip
   allow_failures:
   - go: tip

From 69f47fddc4329b6595f6b5ddcafd4f8349a6a35a Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:17:42 +1000
Subject: [PATCH 20/34] back to go 1.7

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5cd5575d1..4440645e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ env:
   - DEP_VERSION="0.5.0"
 matrix:
   include:
-  - go: 1.X
-    env: LATEST=true
+  # - go: 1.X
   - go: 1.7
+    env: LATEST=true
   - go: tip
   allow_failures:
   - go: tip

From 59ea1491db910caa8ebae5e5e72a66ca5d27a8e0 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:20:04 +1000
Subject: [PATCH 21/34] back to amd64

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4440645e5..bc0c0a363 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
   - go: tip
 before_install:
   # Download the binary to bin folder in $GOPATH
-  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
+  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
   - dep ensure

From d5a73c01661549c9b560e067a3f3f01bd4799389 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:26:08 +1000
Subject: [PATCH 22/34] experimenting

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bc0c0a363..9cbd493ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ env:
   - DEP_VERSION="0.5.0"
 matrix:
   include:
-  # - go: 1.X
+  - go: 1.X
   - go: 1.7
     env: LATEST=true
   - go: tip
@@ -15,6 +15,7 @@ before_install:
   - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
+  - ls $GOPATH/bin/
   - dep ensure
   - go get github.com/mitchellh/gox
 install:

From ade0dc447e21082f7ac6ae21ec4896954c607e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= <ponsfrilus@gmail.com>
Date: Tue, 7 Aug 2018 14:27:11 +0200
Subject: [PATCH 23/34] Code of conduct added

* Based on contributor-covenant.org
---
 CODE-OF-CONDUCT | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 CODE-OF-CONDUCT

diff --git a/CODE-OF-CONDUCT b/CODE-OF-CONDUCT
new file mode 100644
index 000000000..308f11a15
--- /dev/null
+++ b/CODE-OF-CONDUCT
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the [project leader](https://github.com/jesseduffield). 
+All complaints will be reviewed and investigated and will result in a response that
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

From af766c848c00a0ef8fd7a7033b15e4f77e203173 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:27:33 +1000
Subject: [PATCH 24/34] reverting to 386 because it worked before

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9cbd493ff..1fcbe3723 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
   - go: tip
 before_install:
   # Download the binary to bin folder in $GOPATH
-  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
+  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
   - ls $GOPATH/bin/

From a6cb0feff18bfcea9f0473485cf788ddd3ee5834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= <ponsfrilus@gmail.com>
Date: Tue, 7 Aug 2018 14:28:52 +0200
Subject: [PATCH 25/34] Contributing guide added

This is a mix between
  * https://gist.github.com/PurpleBooth/b24679402957c63ec426
  *
https://github.com/thoughtbot/factory_bot_rails/blob/master/CONTRIBUTING.md
  * https://gist.github.com/briandk/3d2e8b3ec8daf5a27a62
  * https://github.com/nayafia/contributing-template
---
 CONTRIBUTING | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 CONTRIBUTING

diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 000000000..ec666985d
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,34 @@
+# Contributing
+
+
+♥ We love pull requests from everyone !
+
+
+When contributing to this repository, please first discuss the change you wish
+to make via issue, email, or any other method with the owners of this repository
+before making a change. 
+
+## So all code changes happen through Pull Requests
+Pull requests are the best way to propose changes to the codebase. We actively
+welcome your pull requests:
+
+1. Fork the repo and create your branch from `master`.
+2. If you've added code that should be tested, add tests.
+3. If you've added code that need documentation, update the documentation.
+4. Be sure to test your modifications.
+5. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+6. Issue that pull request!
+
+## Code of conduct
+Please note by participating in this project, you agree to abide by the [code of conduct].
+
+[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING
+
+## Any contributions you make will be under the MIT Software License
+In short, when you submit code changes, your submissions are understood to be
+under the same [MIT License](http://choosealicense.com/licenses/mit/) that
+covers the project. Feel free to contact the maintainers if that's a concern.
+
+## Report bugs using Github's [issues](https://github.com/jesseduffield/lazygit/issues)
+We use GitHub issues to track public bugs. Report a bug by [opening a new
+issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!
\ No newline at end of file

From b567a86ee5c0d9a7033c4e2640d9a1553a90d29d Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:30:06 +1000
Subject: [PATCH 26/34] another day another attempt at CI

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1fcbe3723..b696f5a22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ env:
   - DEP_VERSION="0.5.0"
 matrix:
   include:
-  - go: 1.X
-  - go: 1.7
+  - go: 1.x
     env: LATEST=true
+  - go: 1.7
   - go: tip
   allow_failures:
   - go: tip

From cda365a93f9c8bd50965806261e95e1f6a0006ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= <ponsfrilus@gmail.com>
Date: Tue, 7 Aug 2018 14:32:04 +0200
Subject: [PATCH 27/34] Contributing guide proposal

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fcd651684..df99c4a6f 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ sudo apt-get install lazygit
 - [ ] i18n
 
 ## Contributing
-I'll find a good template for contributing and then add it to the repo (or if somebody has a suggestion please put up a PR)
+We love your input! Please check out the [contributing guide](CONTRIBUTING).
 
 ## Work in progress
 This is still a work in progress so there's still bugs to iron out and as this is my first project in Go the code could no doubt use an increase in quality, but I'll be improving on it whenever I find the time. If you have any feedback feel free to [raise an issue](https://github.com/jesseduffield/lazygit/issues)/[submit a PR](https://github.com/jesseduffield/lazygit/pulls).

From 2311675d087bbbfbf791895c43561eebc1f6279e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= <ponsfrilus@gmail.com>
Date: Tue, 7 Aug 2018 14:37:35 +0200
Subject: [PATCH 28/34] It appears that markdown files are better handeled by
 GitHub with extensions.

---
 CODE-OF-CONDUCT => CODE-OF-CONDUCT.md | 0
 CONTRIBUTING => CONTRIBUTING.md       | 2 +-
 README.md                             | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename CODE-OF-CONDUCT => CODE-OF-CONDUCT.md (100%)
 rename CONTRIBUTING => CONTRIBUTING.md (98%)

diff --git a/CODE-OF-CONDUCT b/CODE-OF-CONDUCT.md
similarity index 100%
rename from CODE-OF-CONDUCT
rename to CODE-OF-CONDUCT.md
diff --git a/CONTRIBUTING b/CONTRIBUTING.md
similarity index 98%
rename from CONTRIBUTING
rename to CONTRIBUTING.md
index ec666985d..e28913f44 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ welcome your pull requests:
 ## Code of conduct
 Please note by participating in this project, you agree to abide by the [code of conduct].
 
-[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING
+[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md
 
 ## Any contributions you make will be under the MIT Software License
 In short, when you submit code changes, your submissions are understood to be
diff --git a/README.md b/README.md
index df99c4a6f..1ac741768 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ sudo apt-get install lazygit
 - [ ] i18n
 
 ## Contributing
-We love your input! Please check out the [contributing guide](CONTRIBUTING).
+We love your input! Please check out the [contributing guide](CONTRIBUTING.md).
 
 ## Work in progress
 This is still a work in progress so there's still bugs to iron out and as this is my first project in Go the code could no doubt use an increase in quality, but I'll be improving on it whenever I find the time. If you have any feedback feel free to [raise an issue](https://github.com/jesseduffield/lazygit/issues)/[submit a PR](https://github.com/jesseduffield/lazygit/pulls).

From 4528cf95b9cc962148179c24586bd104033a215f Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:48:40 +1000
Subject: [PATCH 29/34] fix wrapping

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b696f5a22..45165bcf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,8 +24,7 @@ script:
 # - go get -v ./...
 # - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory
 # - go vet $(go list ./... | grep -v /vendor/)
-- if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.."
-  -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi
+  - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.." -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi
 deploy:
   provider: releases
   skip_cleanup: true

From d781a8e650fcf39fa2f90ac75cd01aff701e8d19 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 22:53:29 +1000
Subject: [PATCH 30/34] if you had one shot

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 45165bcf2..81ad1a800 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ env:
 matrix:
   include:
   - go: 1.x
-    env: LATEST=true
   - go: 1.7
+    env: LATEST=true
   - go: tip
   allow_failures:
   - go: tip

From 8c823965abd13090c0a72bdcbb03d920c3f04b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?=
 <ponsfrilus@users.noreply.github.com>
Date: Tue, 7 Aug 2018 14:59:22 +0200
Subject: [PATCH 31/34] [fix] link to code of conduct

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e28913f44..540eebb79 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ welcome your pull requests:
 ## Code of conduct
 Please note by participating in this project, you agree to abide by the [code of conduct].
 
-[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md
+[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CODE-OF-CONDUCT.md
 
 ## Any contributions you make will be under the MIT Software License
 In short, when you submit code changes, your submissions are understood to be
@@ -31,4 +31,4 @@ covers the project. Feel free to contact the maintainers if that's a concern.
 
 ## Report bugs using Github's [issues](https://github.com/jesseduffield/lazygit/issues)
 We use GitHub issues to track public bugs. Report a bug by [opening a new
-issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!
\ No newline at end of file
+issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!

From 1730089b09b623d55227ddcc8ce02ad57d7f2cf0 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 23:04:55 +1000
Subject: [PATCH 32/34] try master branch for dep

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81ad1a800..3227277c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,15 @@ env:
 matrix:
   include:
   - go: 1.x
-  - go: 1.7
     env: LATEST=true
+  - go: 1.7
   - go: tip
   allow_failures:
   - go: tip
 before_install:
   # Download the binary to bin folder in $GOPATH
-  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
+  # - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
+  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
   - ls $GOPATH/bin/

From bab884f1df04073283f5f363b2f96937e200511b Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 23:18:18 +1000
Subject: [PATCH 33/34] nonrelative path to binaries

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3227277c3..d921d365d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,9 +32,9 @@ deploy:
   api_key:
     secure: TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA=
   file:
-  - lazygit.windows.amd64.exe
-  - lazygit.darwin.amd64
-  - lazygit.linux.amd64
+  - $GOPATH/bin/lazygit.windows.amd64.exe
+  - $GOPATH/bin/lazygit.darwin.amd64
+  - $GOPATH/bin/lazygit.linux.amd64
   on:
     repo: jesseduffield/lazygit
     tags: true

From ba30e9e450462e3445f7534f3167d54e198b6a7b Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Wed, 8 Aug 2018 07:39:58 +1000
Subject: [PATCH 34/34] log some travis ci stuff

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d921d365d..c55390b48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ before_install:
   # Download the binary to bin folder in $GOPATH
   # - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+  - ls
+  - ls */*
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
   - ls $GOPATH/bin/
@@ -26,15 +28,16 @@ script:
 # - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory
 # - go vet $(go list ./... | grep -v /vendor/)
   - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.." -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi
+  - ls */*
 deploy:
   provider: releases
   skip_cleanup: true
   api_key:
     secure: TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA=
   file:
-  - $GOPATH/bin/lazygit.windows.amd64.exe
-  - $GOPATH/bin/lazygit.darwin.amd64
-  - $GOPATH/bin/lazygit.linux.amd64
+  - lazygit.windows.amd64.exe
+  - lazygit.darwin.amd64
+  - lazygit.linux.amd64
   on:
     repo: jesseduffield/lazygit
     tags: true