better handling of branches and untracked files

1 files changed, 44 insertions, 34 deletions

diff --git a/main.go b/main.go
index 9e7b52683..b3586b04e 100644
--- a/main.go
+++ b/main.go
@@ -1,59 +1,69 @@
 package main
 
 import (
-  "flag"
-  "fmt"
-  "log"
-  "os"
-  "os/user"
-  "time"
-
-  "github.com/fatih/color"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"os/user"
+	"time"
+
+	"github.com/fatih/color"
 )
 
 var (
-  startTime time.Time
-  debugging bool
+	startTime time.Time
+	debugging bool
 )
 
 func homeDirectory() string {
-  usr, err := user.Current()
-  if err != nil {
-    log.Fatal(err)
-  }
-  return usr.HomeDir
+	usr, err := user.Current()
+	if err != nil {
+		log.Fatal(err)
+	}
+	return usr.HomeDir
 }
 
 func devLog(objects ...interface{}) {
-  localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
+	localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
 }
 
 func colorLog(colour color.Attribute, objects ...interface{}) {
-  localLog(colour, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
+	localLog(colour, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/development.log", objects...)
 }
 
 func commandLog(objects ...interface{}) {
-  localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/commands.log", objects...)
+	localLog(color.FgWhite, homeDirectory()+"/go/src/github.com/jesseduffield/lazygit/commands.log", objects...)
 }
 
 func localLog(colour color.Attribute, path string, objects ...interface{}) {
-  if !debugging {
-    return
-  }
-  f, _ := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0644)
-  defer f.Close()
-  for _, object := range objects {
-    colorFunction := color.New(colour).SprintFunc()
-    f.WriteString(colorFunction(fmt.Sprint(object)) + "\n")
-  }
+	if !debugging {
+		return
+	}
+	f, _ := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0644)
+	defer f.Close()
+	for _, object := range objects {
+		colorFunction := color.New(colour).SprintFunc()
+		f.WriteString(colorFunction(fmt.Sprint(object)) + "\n")
+	}
+}
+
+func navigateToRepoRootDirectory() {
+	_, err := os.Stat(".git")
+	for os.IsNotExist(err) {
+		devLog("going up a directory to find the root")
+		os.Chdir("..")
+		_, err = os.Stat(".git")
+	}
 }
 
 func main() {
-  debuggingPointer := flag.Bool("debug", false, "a boolean")
-  flag.Parse()
-  debugging = *debuggingPointer
-  devLog("\n\n\n\n\n\n\n\n\n\n")
-  startTime = time.Now()
-  verifyInGitRepo()
-  run()
+	debuggingPointer := flag.Bool("debug", false, "a boolean")
+	flag.Parse()
+	debugging = *debuggingPointer
+	devLog("\n\n\n\n\n\n\n\n\n\n")
+	startTime = time.Now()
+	verifyInGitRepo()
+	navigateToRepoRootDirectory()
+	run()
 }