Fetch the correct remote branch

samlcharreyron · Jun 1, 2022 · 55a941d · 55a941d
1 parent f9a3188
commit 55a941d
Show file tree

Hide file tree

Showing 50 changed files with 112 additions and 1 deletion.
diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go
@@ -341,7 +341,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 			err := self.git.Sync.Pull(
 				git_commands.PullOptions{
 					RemoteName:      branch.UpstreamRemote,
-					BranchName:      branch.Name,
+					BranchName:      branch.UpstreamBranch,
 					FastForwardOnly: true,
 				},
 			)

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/HEAD b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/config b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/config
@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+[remote "origin"]
+	url = /home/mark/Downloads/gits/lazygit/test/integration/fetchRemoteBranchWithNonmatchingName/actual/./repo
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/description b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/info/exclude b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/info/exclude
@@ -0,0 +1,6 @@
+# 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]
+# *~
diff --git a/...anchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/...anchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
diff --git a/...anchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f b/...anchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
diff --git a/...anchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/...anchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
diff --git a/...anchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/...anchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
diff --git a/...anchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/...anchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591
diff --git a/...anchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 b/...anchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6
@@ -0,0 +1,3 @@
+x��A
+�0@Q�9�����I
+"BW=F�L��!R"����~�����r�*�J��d	��¬�D�j���E��<x����v�f�M�C?�^�^r�;�L9�pF��zL��ɝ}�)�2�,�
diff --git a/...anchWithNonmatchingName/expected/origin/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566 b/...anchWithNonmatchingName/expected/origin/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566
@@ -0,0 +1,2 @@
+x��A
+� E����q�D!�BV9��#�&������y��y�um]�)�m���!�HXJ̀��	���ɢ�xʫ�6�G�	t~L��.$�������z^�4/��zlr��5��x��k��m?��O\�oY7A��?:l

diff --git a/...anchWithNonmatchingName/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/...anchWithNonmatchingName/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
diff --git a/...anchWithNonmatchingName/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/...anchWithNonmatchingName/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
diff --git a/...anchWithNonmatchingName/expected/origin/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc b/...anchWithNonmatchingName/expected/origin/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc
diff --git a/...anchWithNonmatchingName/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/...anchWithNonmatchingName/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
diff --git a/...anchWithNonmatchingName/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/...anchWithNonmatchingName/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/packed-refs b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/packed-refs
@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted 
+b090d7f0029e74de260f7458721b8edd1e618edc refs/heads/master
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/COMMIT_EDITMSG
@@ -0,0 +1 @@
+myfile4
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/FETCH_HEAD b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/FETCH_HEAD
@@ -0,0 +1 @@
+b090d7f0029e74de260f7458721b8edd1e618edc		branch 'master' of ../origin
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/HEAD b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master-local
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/ORIG_HEAD b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/ORIG_HEAD
@@ -0,0 +1 @@
+12d38e54cd419303587ba4613fb1194ec5c9d04f
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/config b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/config
@@ -0,0 +1,14 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	email = [email protected]
+	name = CI
+[remote "origin"]
+	url = ../origin
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master-local"]
+	remote = origin
+	merge = refs/heads/master
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/description b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/index b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/index
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/info/exclude b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/info/exclude
@@ -0,0 +1,6 @@
+# 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]
+# *~
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/HEAD b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/HEAD
@@ -0,0 +1,8 @@
+0000000000000000000000000000000000000000 3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 CI <[email protected]> 1654108479 +0200	commit (initial): myfile1
+3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <[email protected]> 1654108479 +0200	commit: myfile2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 72ee6cc86de71389b9c70e24c7d8c8837e7d3566 CI <[email protected]> 1654108479 +0200	commit: myfile3
+72ee6cc86de71389b9c70e24c7d8c8837e7d3566 b090d7f0029e74de260f7458721b8edd1e618edc CI <[email protected]> 1654108479 +0200	commit: myfile4
+b090d7f0029e74de260f7458721b8edd1e618edc 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <[email protected]> 1654108479 +0200	reset: moving to HEAD~2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 0000000000000000000000000000000000000000 CI <[email protected]> 1654108482 +0200	Branch: renamed refs/heads/master to refs/heads/master-local
+0000000000000000000000000000000000000000 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <[email protected]> 1654108482 +0200	Branch: renamed refs/heads/master to refs/heads/master-local
+12d38e54cd419303587ba4613fb1194ec5c9d04f b090d7f0029e74de260f7458721b8edd1e618edc CI <[email protected]> 1654108482 +0200	pull --no-edit --ff-only origin master: Fast-forward
diff --git a/...fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local b/...fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local
@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 CI <[email protected]> 1654108479 +0200	commit (initial): myfile1
+3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <[email protected]> 1654108479 +0200	commit: myfile2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 72ee6cc86de71389b9c70e24c7d8c8837e7d3566 CI <[email protected]> 1654108479 +0200	commit: myfile3
+72ee6cc86de71389b9c70e24c7d8c8837e7d3566 b090d7f0029e74de260f7458721b8edd1e618edc CI <[email protected]> 1654108479 +0200	commit: myfile4
+b090d7f0029e74de260f7458721b8edd1e618edc 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <[email protected]> 1654108479 +0200	reset: moving to HEAD~2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <[email protected]> 1654108482 +0200	Branch: renamed refs/heads/master to refs/heads/master-local
+12d38e54cd419303587ba4613fb1194ec5c9d04f b090d7f0029e74de260f7458721b8edd1e618edc CI <[email protected]> 1654108482 +0200	pull --no-edit --ff-only origin master: Fast-forward
diff --git a/...chRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master b/...chRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b090d7f0029e74de260f7458721b8edd1e618edc CI <[email protected]> 1654108479 +0200	fetch origin: storing head
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/...NonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f b/...NonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/...NonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/...NonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/...NonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 b/...NonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6
@@ -0,0 +1,3 @@
+x��A
+�0@Q�9�����I
+"BW=F�L��!R"����~�����r�*�J��d	��¬�D�j���E��<x����v�f�M�C?�^�^r�;�L9�pF��zL��ɝ}�)�2�,�
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566 b/...NonmatchingName/expected/repo/.git_keep/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566
@@ -0,0 +1,2 @@
+x��A
+� E����q�D!�BV9��#�&������y��y�um]�)�m���!�HXJ̀��	���ɢ�xʫ�6�G�	t~L��.$�������z^�4/��zlr��5��x��k��m?��O\�oY7A��?:l

diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/...NonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/...NonmatchingName/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc b/...NonmatchingName/expected/repo/.git_keep/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/...NonmatchingName/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
diff --git a/...NonmatchingName/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/...NonmatchingName/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
diff --git a/...tion/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local b/...tion/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local
@@ -0,0 +1 @@
+b090d7f0029e74de260f7458721b8edd1e618edc
diff --git a/...n/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/remotes/origin/master b/...n/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/remotes/origin/master
@@ -0,0 +1 @@
+b090d7f0029e74de260f7458721b8edd1e618edc
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile1 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile1
@@ -0,0 +1 @@
+test1
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile2 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile2
@@ -0,0 +1 @@
+test2
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile3 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile3
@@ -0,0 +1 @@
+test3
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile4 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile4
@@ -0,0 +1 @@
+test4
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/recording.json b/test/integration/fetchRemoteBranchWithNonmatchingName/recording.json
@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":703,"Mod":0,"Key":256,"Ch":108},{"Timestamp":1151,"Mod":0,"Key":256,"Ch":82},{"Timestamp":1692,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2183,"Mod":0,"Key":256,"Ch":45},{"Timestamp":2372,"Mod":0,"Key":256,"Ch":108},{"Timestamp":2498,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2617,"Mod":0,"Key":256,"Ch":99},{"Timestamp":2663,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2724,"Mod":0,"Key":256,"Ch":108},{"Timestamp":3196,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3837,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4854,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":213,"Height":56}]}
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/setup.sh b/test/integration/fetchRemoteBranchWithNonmatchingName/setup.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+set -e
+
+cd $1
+
+git init
+
+git config user.email "[email protected]"
+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 ./repo origin
+
+cd repo
+
+git reset --hard HEAD~2
+git remote add origin ../origin
+git fetch origin
+git branch --set-upstream-to=origin/master
+
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/test.json b/test/integration/fetchRemoteBranchWithNonmatchingName/test.json
@@ -0,0 +1 @@
+{ "description": "allow unsetting the upstream of the current branch", "speed": 10 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Unnamed repository; edit this file 'description' to name the repository.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		x��A
		� E��q�D!�BV9��#�&��y��y�um]�)�m��!�HXJ̀�� ɢ�xʫ�6�G� t~L��.$��z^�4/��zlr��5��x��k��m?��O\�oY7A��?:l
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# pack-refs with: peeled fully-peeled sorted
		b090d7f0029e74de260f7458721b8edd1e618edc refs/heads/master
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0000000000000000000000000000000000000000 b090d7f0029e74de260f7458721b8edd1e618edc CI <[email protected]> 1654108479 +0200 fetch origin: storing head
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"KeyEvents":[{"Timestamp":703,"Mod":0,"Key":256,"Ch":108},{"Timestamp":1151,"Mod":0,"Key":256,"Ch":82},{"Timestamp":1692,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2183,"Mod":0,"Key":256,"Ch":45},{"Timestamp":2372,"Mod":0,"Key":256,"Ch":108},{"Timestamp":2498,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2617,"Mod":0,"Key":256,"Ch":99},{"Timestamp":2663,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2724,"Mod":0,"Key":256,"Ch":108},{"Timestamp":3196,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3837,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4854,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":213,"Height":56}]}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{ "description": "allow unsetting the upstream of the current branch", "speed": 10 }