amend! Add BranchBeingRebased to Model struct

Add CheckedOutBranch to Model struct

Author: stefanhaller

pkg/gui/controllers/helpers/refresh_helper.go

@@ -249,6 +249,32 @@ func (self *RefreshHelper) refreshCommits() {
 	wg.Wait()
 }
 
+func (self *RefreshHelper) determineCheckoutBranchName() string {
+	if rebasedBranch := self.c.Git().Status.BranchBeingRebased(); rebasedBranch != "" {
+		// During a rebase we're on a detached head, so cannot determine the
+		// branch name in the usual way. We need to read it from the
+		// ".git/rebase-merge/head-name" file instead.
+		return strings.TrimPrefix(rebasedBranch, "refs/heads/")
+	}
+
+	if bisectedBranch := self.c.Git().Bisect.GetInfo().GetStartSha(); bisectedBranch != "" {
+		// Likewise, when we're bisecting we're on a detached head as well. In
+		// this case we read the branch name from the ".git/BISECT_START" file.
+		return bisectedBranch
+	}
+
+	// In all other cases, get the branch name by asking git what branch is
+	// checked out. Note that if we're on a detached head (for reasons other
+	// than rebasing or bisecting, i.e. it was explicitly checked out), then
+	// this will return its sha.
+	if branchInfo, err := self.c.Git().Branch.CurrentBranchInfo(); err == nil {
+		return branchInfo.RefName
+	}
+
+	// Should never get here unless the working copy is corrupt
+	return ""
+}
+
 func (self *RefreshHelper) refreshCommitsWithLimit() error {
 	self.c.Mutexes().LocalCommitsMutex.Lock()
 	defer self.c.Mutexes().LocalCommitsMutex.Unlock()
@@ -267,7 +293,7 @@ func (self *RefreshHelper) refreshCommitsWithLimit() error {
 	}
 	self.c.Model().Commits = commits
 	self.c.Model().WorkingTreeStateAtLastCommitRefresh = self.c.Git().Status.WorkingTreeState()
-	self.c.Model().BranchBeingRebased = self.c.Git().Status.BranchBeingRebased()
+	self.c.Model().CheckedOutBranch = self.determineCheckoutBranchName()
 
 	return self.c.PostRefreshUpdate(self.c.Contexts().LocalCommits)
 }

pkg/gui/types/common.go

@@ -210,9 +210,9 @@ type Model struct {
 	RemoteBranches                      []*models.RemoteBranch
 	Tags                                []*models.Tag
 
-	// Full ref (e.g. "refs/heads/mybranch") of the branch that is currently
-	// being rebased, or empty string when we're not in a rebase
-	BranchBeingRebased string
+	// Name of the currently checked out branch. This will be set even when
+	// we're on a detached head because we're rebasing or bisecting.
+	CheckedOutBranch string
 
 	// for displaying suggestions while typing in a file name
 	FilesTrie *patricia.Trie