fix: recognize remote branch merge

JanDeDobbeleer · Sep 13, 2021 · 18dcf4b · 18dcf4b
1 parent fb1c704
commit 18dcf4b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/segment_git.go b/src/segment_git.go
@@ -350,7 +350,7 @@ func (g *git) getGitHEADContext(ref string) string {
 	if g.hasGitFile("MERGE_MSG") && g.hasGitFile("MERGE_HEAD") {
 		icon := g.props.getString(MergeIcon, "\uE727 ")
 		mergeContext := g.getGitFileContents(g.repo.gitWorkingFolder, "MERGE_MSG")
-		matches := findNamedRegexMatch(`Merge branch '(?P<head>.*)' into`, mergeContext)
+		matches := findNamedRegexMatch(`Merge (remote-tracking )?branch '(?P<head>.*)' into`, mergeContext)
 		if matches != nil && matches["head"] != "" {
 			branch := g.truncateBranch(matches["head"])
 			return fmt.Sprintf("%s%s%s into %s", icon, branchIcon, branch, ref)

diff --git a/src/segment_git_test.go b/src/segment_git_test.go
@@ -86,6 +86,7 @@ type detachedContext struct {
 	sequencerTodo string
 	merge         bool
 	mergeHEAD     string
+	mergeMsgStart string
 	status        string
 }
 
@@ -103,7 +104,7 @@ func setupHEADContextEnv(context *detachedContext) *git {
 	env.On("getFileContent", "/rebase-apply/head-name").Return(context.origin)
 	env.On("getFileContent", "/CHERRY_PICK_HEAD").Return(context.cherryPickSHA)
 	env.On("getFileContent", "/REVERT_HEAD").Return(context.revertSHA)
-	env.On("getFileContent", "/MERGE_MSG").Return(fmt.Sprintf("Merge branch '%s' into %s", context.mergeHEAD, context.onto))
+	env.On("getFileContent", "/MERGE_MSG").Return(fmt.Sprintf("%s '%s' into %s", context.mergeMsgStart, context.mergeHEAD, context.onto))
 	env.On("getFileContent", "/sequencer/todo").Return(context.sequencerTodo)
 	env.On("getFileContent", "/HEAD").Return(context.branchName)
 	env.On("hasFilesInDir", "", "CHERRY_PICK_HEAD").Return(context.cherryPick)
@@ -302,8 +303,21 @@ func TestGetGitHEADContextSequencerRevertOnTag(t *testing.T) {
 func TestGetGitHEADContextMerge(t *testing.T) {
 	want := "\ue727 \ue0a0feat into \ue0a0main"
 	context := &detachedContext{
-		merge:     true,
-		mergeHEAD: "feat",
+		merge:         true,
+		mergeHEAD:     "feat",
+		mergeMsgStart: "Merge branch",
+	}
+	g := setupHEADContextEnv(context)
+	got := g.getGitHEADContext("main")
+	assert.Equal(t, want, got)
+}
+
+func TestGetGitHEADContextMergeRemote(t *testing.T) {
+	want := "\ue727 \ue0a0feat into \ue0a0main"
+	context := &detachedContext{
+		merge:         true,
+		mergeHEAD:     "feat",
+		mergeMsgStart: "Merge remote-tracking branch",
 	}
 	g := setupHEADContextEnv(context)
 	got := g.getGitHEADContext("main")
@@ -313,9 +327,10 @@ func TestGetGitHEADContextMerge(t *testing.T) {
 func TestGetGitHEADContextMergeTag(t *testing.T) {
 	want := "\ue727 \ue0a0feat into \uf412v3.4.6"
 	context := &detachedContext{
-		tagName:   "v3.4.6",
-		merge:     true,
-		mergeHEAD: "feat",
+		tagName:       "v3.4.6",
+		merge:         true,
+		mergeHEAD:     "feat",
+		mergeMsgStart: "Merge branch",
 	}
 	g := setupHEADContextEnv(context)
 	got := g.getGitHEADContext("")