revert previous commit with correct function code

Author: neel1996

README.md

@@ -81,9 +81,9 @@ $ ./make.bat build
 
 | Software | Purpose |
 | -- | -- |
-| <b>[Git v2.20+](https://git-scm.com/)</b> | <b>Required for handling some intense git operations with the target repo</b> |
-| <b>[Go v1.15](https://golang.org/)</b> | <b>For building the backend from the source</b> |
-| <b>[npm v6+](https://nodejs.org/en/)</b> | <b>For building the react UI bundle from scratch</b> |
+| <b>[Git](https://git-scm.com/)</b> | <b>Required for handling some intense git operations with the target repo</b> |
+| <b>[Go](https://golang.org/)</b> | <b>For building the backend from the source</b> |
+| <b>[Node JS](https://nodejs.org/en/)</b> | <b>For building the react UI bundle from scratch</b> |
 
 > **Important note for windows users**
 

api/code_file_view.go

@@ -22,7 +22,7 @@ func CodeFileView(repoPath string, fileName string) *model.CodeFileType {
 			FileData: nil,
 		}
 	} else {
-		logger.Log(fmt.Sprintf("Reading lines from file --> %s", fileName), global.StatusInfo)
+		logger.Log(fmt.Sprintf("Reading lines from file --> %s", targetFile), global.StatusInfo)
 		scanner := bufio.NewScanner(file)
 		scanner.Split(bufio.ScanLines)
 		for scanner.Scan() {

git/git_branch_add.go

@@ -12,6 +12,7 @@ func AddBranch(repo *git.Repository, branchName string) string {
 	logger := global.Logger{}
 	headRef, headErr := repo.Head()
 
+	logger.Log(fmt.Sprintf("Adding new branch -> %s", branchName), global.StatusInfo)
 	if headErr != nil {
 		logger.Log(fmt.Sprintf("Unable to fetch HEAD -> %s", headErr.Error()), global.StatusError)
 		return "BRANCH_ADD_FAILED"

git/git_branch_list.go

@@ -50,17 +50,19 @@ func GetBranchList(repo *git.Repository, branchChan chan Branch) {
 					refNamePtr *string
 				)
 
-				if reference.Name().String() != "HEAD" && strings.Contains(reference.Name().String(), "refs/") {
-					refNameSplit := strings.Split(reference.Name().String(), "refs/")
-					if len(refNameSplit) == 2 {
-						logger.Log(fmt.Sprintf("Available Branch : %v", refNameSplit[1]), global.StatusInfo)
-						if strings.Contains(refNameSplit[1], "heads/") {
-							headBranch := strings.Split(refNameSplit[1], "heads/")[1]
-							refNamePtr = &headBranch
-						} else {
-							refNamePtr = &refNameSplit[1]
+				if ref != nil {
+					if reference.Name().String() != "HEAD" && strings.Contains(reference.Name().String(), "refs/") {
+						refNameSplit := strings.Split(reference.Name().String(), "refs/")
+						if len(refNameSplit) == 2 {
+							logger.Log(fmt.Sprintf("Available Branch : %v", refNameSplit[1]), global.StatusInfo)
+							if strings.Contains(refNameSplit[1], "heads/") {
+								headBranch := strings.Split(refNameSplit[1], "heads/")[1]
+								refNamePtr = &headBranch
+							} else {
+								refNamePtr = &refNameSplit[1]
+							}
+							allBranchList = append(allBranchList, refNamePtr)
 						}
-						allBranchList = append(allBranchList, refNamePtr)
 					}
 				}
 

git/git_commit_changes.go

@@ -9,6 +9,7 @@ import (
 	"github.com/neel1996/gitconvex-server/global"
 	"github.com/neel1996/gitconvex-server/utils"
 	"runtime"
+	"strings"
 	"time"
 )
 
@@ -33,40 +34,55 @@ func windowsCommit(repoPath string, msg string) string {
 // The function falls back to the native git client for Windows platform due to an existing bug in the go-git library which
 // blocks commits in windows platform
 func CommitChanges(repo *git.Repository, commitMessage string) string {
+	var formattedMessage = commitMessage
 	logger := global.Logger{}
 	w, wErr := repo.Worktree()
 
-	// Checking OS platform for switching to git client for Windows systems
-	platform := runtime.GOOS
-	if platform == "windows" && w != nil {
-		logger.Log(fmt.Sprintf("OS is %s -- Switching to native git client", platform), global.StatusWarning)
-		return windowsCommit(w.Filesystem.Root(), commitMessage)
-	}
+	if wErr != nil {
+		logger.Log(fmt.Sprintf("Error occurred while fetching repo worktree -> %s", wErr.Error()), global.StatusError)
+		return "COMMIT_FAILED"
+	} else {
+		//Checking and splitting multi-line commit messages
+		if strings.Contains(commitMessage, "||") {
+			splitMessage := strings.Split(commitMessage, "||")
+			formattedMessage = strings.Join(splitMessage, "\n")
+		}
 
-	// Logic to check if the repo / global config has proper user information setup
-	// Commit will be signed by default user if no user config is present
-	globalConfig, gCfgErr := repo.ConfigScoped(config.GlobalScope)
-	localConfig, lCfgErr := repo.ConfigScoped(config.LocalScope)
-	var author string
+		// Checking OS platform for switching to git client for Windows systems
+		platform := runtime.GOOS
+		if platform == "windows" && w != nil {
+			logger.Log(fmt.Sprintf("OS is %s -- Switching to native git client", platform), global.StatusWarning)
+			return windowsCommit(w.Filesystem.Root(), formattedMessage)
+		}
+
+		// Checking if repo is a fresh repo with no branches
+		// fallback function will be used to commit with git if no branches are present
+		head, _ := repo.Head()
+		if head == nil {
+			logger.Log("Repo with no HEAD", global.StatusWarning)
+			return windowsCommit(w.Filesystem.Root(), formattedMessage)
+		}
 
-	if gCfgErr == nil && lCfgErr == nil {
-		fmt.Println(localConfig.User)
-		fmt.Println(globalConfig.User)
+		// Logic to check if the repo / global config has proper user information setup
+		// Commit will be signed by default user if no user config is present
+		globalConfig, gCfgErr := repo.ConfigScoped(config.GlobalScope)
+		localConfig, lCfgErr := repo.ConfigScoped(config.LocalScope)
+		var author string
 
-		if globalConfig.User.Name != "" {
-			author = globalConfig.User.Name
-		} else if localConfig.User.Name != "" {
-			author = localConfig.User.Name
+		if gCfgErr == nil && lCfgErr == nil {
+			fmt.Println(localConfig.User)
+			fmt.Println(globalConfig.User)
+
+			if globalConfig.User.Name != "" {
+				author = globalConfig.User.Name
+			} else if localConfig.User.Name != "" {
+				author = localConfig.User.Name
+			}
+		} else {
+			logger.Log(fmt.Sprintf("Unable to fetch repo config -> %v || %v", gCfgErr, lCfgErr), global.StatusError)
+			return "COMMIT_FAILED"
 		}
-	} else {
-		logger.Log(fmt.Sprintf("Unable to fetch repo config -> %v || %v", gCfgErr, lCfgErr), global.StatusError)
-		return "COMMIT_FAILED"
-	}
 
-	if wErr != nil {
-		logger.Log(fmt.Sprintf("Error occurred while fetching repo worktree -> %s", wErr.Error()), global.StatusError)
-		return "COMMIT_FAILED"
-	} else {
 		var commitOptions *git.CommitOptions
 		var parentHash plumbing.Hash
 		head, headErr := repo.Head()
@@ -89,13 +105,18 @@ func CommitChanges(repo *git.Repository, commitMessage string) string {
 				Parents: []plumbing.Hash{parentHash},
 			}
 		} else {
-			logger.Log(fmt.Sprintf("Commiting changes with author -> %s", author), global.StatusInfo)
+			logger.Log(fmt.Sprintf("Commiting changes with author -> %s, message -> %s", author, formattedMessage), global.StatusInfo)
 			commitOptions = &git.CommitOptions{
 				All:     false,
 				Parents: []plumbing.Hash{parentHash},
 			}
 		}
-		hash, err := w.Commit(commitMessage, commitOptions)
+
+		if formattedMessage == "" {
+			return "COMMIT_FAILED"
+		}
+
+		hash, err := w.Commit(formattedMessage, commitOptions)
 		if err != nil {
 			logger.Log(fmt.Sprintf("Error occurred while committing changes -> %s\n%v", err.Error(), err), global.StatusError)
 			return "COMMIT_FAILED"