Merge pull request #9 from julien040/feature

Add additionnal infos in whereami and status | Prevent bug in merge
julien040 · Feb 1, 2023 · cdb4b80 · cdb4b80
2 parents 9723267 + 6bc52d8
commit cdb4b80
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/src/controller/merge.go b/src/controller/merge.go
@@ -31,6 +31,11 @@ func Merge(cmd *cobra.Command, args []string) {
 
 	}
 
+	currentBranch, err := executor.GetCurrentBranch(wd)
+	if err != nil {
+		exitOnError("Sorry, I can't get the current branch 😢", err)
+	}
+
 	var branch string
 
 	askForBranch := func() string {
@@ -72,6 +77,12 @@ func Merge(cmd *cobra.Command, args []string) {
 		if err != nil {
 			exitOnError("Sorry, I can't check if the branch exists 😢", err)
 		}
+
+		if branch == currentBranch {
+			print.Message("You can't merge %s into itself 😢", print.Error, branch)
+			branch = askForBranch()
+		}
+
 		// If not, ask him
 		if !exists {
 			print.Message(fmt.Sprintf("I'm sorry, but the branch %s doesn't exist 😢", branch), print.Error)
@@ -82,11 +93,6 @@ func Merge(cmd *cobra.Command, args []string) {
 		branch = askForBranch()
 	}
 
-	currentBranch, err := executor.GetCurrentBranch(wd)
-	if err != nil {
-		exitOnError("Sorry, I can't get the current branch 😢", err)
-	}
-
 	// Prompt the user to sync his changes
 	// If the repo is not sync with the upstream, the pull request will not have the latest changes
 	promptUserToSync := func() {

diff --git a/src/controller/status.go b/src/controller/status.go
@@ -19,12 +19,22 @@ func Status(cmd *cobra.Command, args []string) {
 
 	checkIfGitRepoInitialized(wd)
 
-	/* --------------------------- Get current branch --------------------------- */
-	branch, err := executor.GetCurrentBranch(wd)
+	// Check if the head is detached
+	detached, err := executor.IsDetachedHead(wd)
 	if err != nil {
-		exitOnError("Sorry, I can't get the current branch 😢", err)
+		exitOnError("Sorry, I can't check if the HEAD is detached 😢", err)
+	}
+
+	/* --------------------------- Get current branch --------------------------- */
+	if detached {
+		fmt.Println("HEAD is detached (lookout mode)")
+	} else {
+		branch, err := executor.GetCurrentBranch(wd)
+		if err != nil {
+			exitOnError("Sorry, I can't get the current branch 😢", err)
+		}
+		fmt.Printf("On branch %s\n", color.HiGreenString(branch))
 	}
-	fmt.Printf("On branch %s\n", color.HiGreenString(branch))
 
 	/* --------------------------- Get status of files -------------------------- */
 	status, err := executor.GetStatus(wd)

diff --git a/src/controller/whereami.go b/src/controller/whereami.go
@@ -31,6 +31,16 @@ func WhereAmI(cmd *cobra.Command, args []string) {
 		exitOnError("Sorry, I can't get the current branch 😢", err)
 	}
 
+	// Check if the head is detached
+	detached, err := executor.IsDetachedHead(wd)
+	if err != nil {
+		exitOnError("Sorry, I can't check if the HEAD is detached 😢", err)
+	}
+	if detached {
+		fmt.Printf("HEAD is detached (lookout mode) at %s\n", color.HiGreenString(hash))
+		return
+	}
+
 	fmt.Printf("HEAD is at %s on branch %s\n", color.HiGreenString(hash), color.HiGreenString(branch))
 
 }