always specify upstream when pushing/pulling

test/integration/pullAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+myfile4

test/integration/pullAndSetUpstream/expected/.git_keep/FETCH_HEAD

@@ -0,0 +1 @@
+766e681a51daa75233c1c4ae8845be2c893577d5		branch 'master' of ../actual_remote

test/integration/pullAndSetUpstream/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

test/integration/pullAndSetUpstream/expected/.git_keep/ORIG_HEAD

@@ -0,0 +1 @@
+c9fd61f40de25556977e063683d1de612f931ccb

test/integration/pullAndSetUpstream/expected/.git_keep/config

@@ -0,0 +1,16 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = CI@example.com
+	name = CI
+[remote "origin"]
+	url = ../actual_remote
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

test/integration/pullAndSetUpstream/expected/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/pullAndSetUpstream/expected/.git_keep/info/exclude

@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store

test/integration/pullAndSetUpstream/expected/.git_keep/logs/HEAD

@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 972fb9caab8b8536ae38687fec98304b76748b9d CI <CI@example.com> 1642217132 +1100	commit (initial): myfile1
+972fb9caab8b8536ae38687fec98304b76748b9d c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100	commit: myfile2
+c9fd61f40de25556977e063683d1de612f931ccb 06d3929607b7519beb45ca67165a1f2b5c0e578b CI <CI@example.com> 1642217132 +1100	commit: myfile3
+06d3929607b7519beb45ca67165a1f2b5c0e578b 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217132 +1100	commit: myfile4
+766e681a51daa75233c1c4ae8845be2c893577d5 c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100	reset: moving to HEAD~2
+c9fd61f40de25556977e063683d1de612f931ccb 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217139 +1100	rebase -i (start): checkout 766e681a51daa75233c1c4ae8845be2c893577d5
+766e681a51daa75233c1c4ae8845be2c893577d5 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217139 +1100	rebase -i (finish): returning to refs/heads/master

test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/heads/master

@@ -0,0 +1,6 @@
+0000000000000000000000000000000000000000 972fb9caab8b8536ae38687fec98304b76748b9d CI <CI@example.com> 1642217132 +1100	commit (initial): myfile1
+972fb9caab8b8536ae38687fec98304b76748b9d c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100	commit: myfile2
+c9fd61f40de25556977e063683d1de612f931ccb 06d3929607b7519beb45ca67165a1f2b5c0e578b CI <CI@example.com> 1642217132 +1100	commit: myfile3
+06d3929607b7519beb45ca67165a1f2b5c0e578b 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217132 +1100	commit: myfile4
+766e681a51daa75233c1c4ae8845be2c893577d5 c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100	reset: moving to HEAD~2
+c9fd61f40de25556977e063683d1de612f931ccb 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217139 +1100	rebase -i (finish): refs/heads/master onto 766e681a51daa75233c1c4ae8845be2c893577d5

test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217132 +1100	fetch origin: storing head

test/integration/pullAndSetUpstream/expected/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+766e681a51daa75233c1c4ae8845be2c893577d5

test/integration/pullAndSetUpstream/expected/.git_keep/refs/remotes/origin/master

@@ -0,0 +1 @@
+766e681a51daa75233c1c4ae8845be2c893577d5

test/integration/pullAndSetUpstream/expected/myfile1

@@ -0,0 +1 @@
+test1

test/integration/pullAndSetUpstream/expected/myfile2

@@ -0,0 +1 @@
+test2

test/integration/pullAndSetUpstream/expected/myfile3

@@ -0,0 +1 @@
+test3

test/integration/pullAndSetUpstream/expected/myfile4

@@ -0,0 +1 @@
+test4

test/integration/pullAndSetUpstream/expected_remote/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

test/integration/pullAndSetUpstream/expected_remote/config

@@ -0,0 +1,8 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true
+	precomposeunicode = true
+[remote "origin"]
+	url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullAndSetUpstream/./actual

test/integration/pullAndSetUpstream/expected_remote/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/pullAndSetUpstream/expected_remote/info/exclude

@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store

test/integration/pullAndSetUpstream/expected_remote/packed-refs

@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted 
+766e681a51daa75233c1c4ae8845be2c893577d5 refs/heads/master

test/integration/pullAndSetUpstream/recording.json

@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":423,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1032,"Mod":0,"Key":127,"Ch":127},{"Timestamp":1216,"Mod":0,"Key":127,"Ch":127},{"Timestamp":1376,"Mod":0,"Key":127,"Ch":127},{"Timestamp":1536,"Mod":0,"Key":127,"Ch":127},{"Timestamp":1687,"Mod":0,"Key":127,"Ch":127},{"Timestamp":1847,"Mod":0,"Key":127,"Ch":127},{"Timestamp":2016,"Mod":0,"Key":127,"Ch":127},{"Timestamp":2240,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3044,"Mod":0,"Key":27,"Ch":0},{"Timestamp":3768,"Mod":0,"Key":256,"Ch":112},{"Timestamp":4184,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4232,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4288,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4728,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5488,"Mod":0,"Key":27,"Ch":0},{"Timestamp":5799,"Mod":0,"Key":256,"Ch":112},{"Timestamp":6273,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7207,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/pullAndSetUpstream/setup.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -e
+
+cd $1
+
+git init
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+echo test1 > myfile1
+git add .
+git commit -am "myfile1"
+echo test2 > myfile2
+git add .
+git commit -am "myfile2"
+echo test3 > myfile3
+git add .
+git commit -am "myfile3"
+echo test4 > myfile4
+git add .
+git commit -am "myfile4"
+
+cd ..
+git clone --bare ./actual actual_remote
+
+cd actual
+
+# the test is to ensure that we actually can pull these two commits back from the origin
+git reset --hard HEAD~2
+git remote add origin ../actual_remote
+git fetch origin

test/integration/pullAndSetUpstream/test.json

@@ -0,0 +1,4 @@
+{
+  "description": "pull changes from the remote, setting upstream",
+  "speed": 10
+}