summaryrefslogtreecommitdiffstats
path: root/pkg/gui/diffing.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-15 14:20:09 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-15 15:34:01 +1100
commit1c84f7731920e1970d52f81361d321268054e559 (patch)
tree077e68eb695b29fdf911f48a83c654b8bfb72f35 /pkg/gui/diffing.go
parent8d8bdb948b089250c22f3ac4f549152a209dcdb2 (diff)
always specify upstream when pushing/pulling
Diffstat (limited to 'pkg/gui/diffing.go')
-rw-r--r--pkg/gui/diffing.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/diffing.go b/pkg/gui/diffing.go
index e3b888066..2721a1880 100644
--- a/pkg/gui/diffing.go
+++ b/pkg/gui/diffing.go
@@ -44,8 +44,8 @@ func (gui *Gui) currentDiffTerminals() []string {
branch := gui.getSelectedBranch()
if branch != nil {
names := []string{branch.ID()}
- if branch.UpstreamName != "" {
- names = append(names, branch.UpstreamName)
+ if branch.IsTrackingRemote() {
+ names = append(names, branch.ID()+"@{u}")
}
return names
}