From af51632d819713883840ad2c95cdb7c49c8798bb Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@m2.nz>
Date: Sat, 9 Oct 2021 15:06:27 +1300
Subject: [PATCH] Add better error handling

---
 internal/nzcovidbot/git.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/internal/nzcovidbot/git.go b/internal/nzcovidbot/git.go
index 59248a7..e58dc7a 100644
--- a/internal/nzcovidbot/git.go
+++ b/internal/nzcovidbot/git.go
@@ -62,14 +62,15 @@ func checkForUpdates() {
 	// Get current commit hash PRE PULL
 	currentHead, err := gitRepo.Head()
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Err getting head: %s", err)
+		return
 	}
 	currentHash := currentHead.Hash()
 
 	// Pull latest changes if exist
 	worktree, err := gitRepo.Worktree()
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Err getting worktree: %s", err)
 	}
 	err = worktree.Pull(&pullOptions)
 	if err != nil {
@@ -77,38 +78,44 @@ func checkForUpdates() {
 			log.Println("No updates")
 			return
 		} else {
-			log.Fatal(err)
+			log.Printf("Err pulling: %s", err)
+			return
 		}
 	}
 
 	// Get current commit hash POST PULL
 	head, err := gitRepo.Head()
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Err getting new head: %s", err)
+		return
 	}
 
 	// Get latest commit
 	latestCommit, err := gitRepo.CommitObject(head.Hash())
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Err getting latest commit: %s", err)
+		return
 	}
 
 	// Get current commit
 	currentCommit, err := gitRepo.CommitObject(currentHash)
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Err getting new commit: %s", err)
+		return
 	}
 
 	// Get patch of changes
 	patch, err := currentCommit.Patch(latestCommit)
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Err getting change patch: %s", err)
+		return
 	}
 
 	// Parse git diff
 	diff, err := diffparser.Parse(patch.String())
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Err parsing diff: %s", err)
+		return
 	}
 
 	// Loop through file changes