From 55a941d5dc457b0f78f04a7bbf6caea93b732fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= <luka.markusic@microblink.com>
Date: Wed, 1 Jun 2022 20:30:13 +0200
Subject: [PATCH] Fetch the correct remote branch

---
 pkg/gui/controllers/branches_controller.go    |   2 +-
 .../expected/origin/HEAD                      |   1 +
 .../expected/origin/config                    |   6 +++
 .../expected/origin/description               |   1 +
 .../expected/origin/info/exclude              |   6 +++
 .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes
 .../12/d38e54cd419303587ba4613fb1194ec5c9d04f | Bin 0 -> 149 bytes
 .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes
 .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes
 .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes
 .../3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 |   3 ++
 .../72/ee6cc86de71389b9c70e24c7d8c8837e7d3566 |   2 +
 .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes
 .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes
 .../b0/90d7f0029e74de260f7458721b8edd1e618edc | Bin 0 -> 149 bytes
 .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes
 .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes
 .../expected/origin/packed-refs               |   2 +
 .../expected/repo/.git_keep/COMMIT_EDITMSG    |   1 +
 .../expected/repo/.git_keep/FETCH_HEAD        |   1 +
 .../expected/repo/.git_keep/HEAD              |   1 +
 .../expected/repo/.git_keep/ORIG_HEAD         |   1 +
 .../expected/repo/.git_keep/config            |  14 +++++++
 .../expected/repo/.git_keep/description       |   1 +
 .../expected/repo/.git_keep/index             | Bin 0 -> 353 bytes
 .../expected/repo/.git_keep/info/exclude      |   6 +++
 .../expected/repo/.git_keep/logs/HEAD         |   8 ++++
 .../.git_keep/logs/refs/heads/master-local    |   7 ++++
 .../.git_keep/logs/refs/remotes/origin/master |   1 +
 .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes
 .../12/d38e54cd419303587ba4613fb1194ec5c9d04f | Bin 0 -> 149 bytes
 .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes
 .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes
 .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes
 .../3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 |   3 ++
 .../72/ee6cc86de71389b9c70e24c7d8c8837e7d3566 |   2 +
 .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes
 .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes
 .../b0/90d7f0029e74de260f7458721b8edd1e618edc | Bin 0 -> 149 bytes
 .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes
 .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes
 .../repo/.git_keep/refs/heads/master-local    |   1 +
 .../repo/.git_keep/refs/remotes/origin/master |   1 +
 .../expected/repo/myfile1                     |   1 +
 .../expected/repo/myfile2                     |   1 +
 .../expected/repo/myfile3                     |   1 +
 .../expected/repo/myfile4                     |   1 +
 .../recording.json                            |   1 +
 .../setup.sh                                  |  36 ++++++++++++++++++
 .../test.json                                 |   1 +
 50 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/HEAD
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/config
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/description
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/info/exclude
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/packed-refs
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/COMMIT_EDITMSG
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/FETCH_HEAD
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/HEAD
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/ORIG_HEAD
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/config
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/description
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/index
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/info/exclude
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/HEAD
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/remotes/origin/master
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile1
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile2
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile3
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile4
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/recording.json
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/setup.sh
 create mode 100644 test/integration/fetchRemoteBranchWithNonmatchingName/test.json

diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go
index 6b86dfcd3..b049a0a0b 100644
--- 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
new file mode 100644
index 000000000..cb089cd89
--- /dev/null
+++ 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
new file mode 100644
index 000000000..ccf112f58
--- /dev/null
+++ 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
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ 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
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ 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/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
new file mode 100644
index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e
GIT binary patch
literal 52
zcmb<m)YkO!4K*-JH83$SFg6T4vDWAG8Bf!ch+WS=#$UZ69k1lHxZ=}XJ(h~CCGo5b
Ijy?h}0Qz4PZU6uP

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
new file mode 100644
index 0000000000000000000000000000000000000000..f43085f4d25e6f6348f42abf8b72215d1e19bf8e
GIT binary patch
literal 149
zcmV;G0BZku0gaB$3c@fD20iB~au;Otw{1W~=&6sf+kU}<v86=Nx3`brb!HATt+g)A
zx*Sh!2ds1<I!U?EJOd?j2Irz2xcAJn_e#Y_$7YiquVw?1_(Ub>At4cxg9aiNnE>sQ
zYCn^*k#~EnyB$V*9mYF8Qnx2A(^_xVaf*)m*kyYrPh<{yOf~$OoBA!w6W;s)E5bVh
DYmG%8

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
new file mode 100644
index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@DUS(>~ZE#08nZNMgRZ+

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
new file mode 100644
index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422
GIT binary patch
literal 103
zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB
zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL
J8UTCqE3ZN5G4lWb

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591
new file mode 100644
index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9
GIT binary patch
literal 128
zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB
zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL
i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6
new file mode 100644
index 000000000..0b97b6ff4
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/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�,�
\ No newline at end of file
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566
new file mode 100644
index 000000000..7dccbe9b7
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/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
\ No newline at end of file
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
new file mode 100644
index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@Cg%x>`~^A08nuUMF0Q*

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
new file mode 100644
index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66
GIT binary patch
literal 77
zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%t<w5Si0x&U)9tbUm`-Ic=DYt1bDS{
jUqw-3#2~@*!>B=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc
new file mode 100644
index 0000000000000000000000000000000000000000..1862ebd3c3feafed14da69f01a205eedeea79ac1
GIT binary patch
literal 149
zcmV;G0BZku0gaA93c@fD06pgwxeKzJY<4#wBJ|W}#B_^-v86=N-`gj69cEza(%PeY
z%yj6RnGZ9g5G05S6m>?rA#>6a6Ps|Lm}*HG-C8z#buYn;YgL|1FlxT#Dqw-COj=c=
zm`r=huDttw+59m2^DtiRQ`-8pQ(fA{BPT*olI)KV0NhUZscwJju6^gn)5!e**OWNK
DU$IK2

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
new file mode 100644
index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@F5d}>}lpN08nuUO8@`>

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
new file mode 100644
index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@EH?>>`CU&08otwO#lD@

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/packed-refs b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/packed-refs
new file mode 100644
index 000000000..19e0f32e9
--- /dev/null
+++ 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
new file mode 100644
index 000000000..51be8ec3d
--- /dev/null
+++ 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
new file mode 100644
index 000000000..09935c2a5
--- /dev/null
+++ 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
new file mode 100644
index 000000000..416a3a6d6
--- /dev/null
+++ 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
new file mode 100644
index 000000000..2aae46d33
--- /dev/null
+++ 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
new file mode 100644
index 000000000..4e08dfbfc
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/config
@@ -0,0 +1,14 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	email = CI@example.com
+	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
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ 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
new file mode 100644
index 0000000000000000000000000000000000000000..3dd3930219a8ba5d7e12b178a303ad098141b955
GIT binary patch
literal 353
zcmZ?q402{*U|<4bmZa$$?HOyge}K_IF)2ppat;QD#w834%r79Afo<uY$A48*Z+wXe
zjpE67x)9*i(tVYIJ-0F~Gbhy$s0pN>NzBgzMnlb!LN`Z(=Z8^)(!O&qS1k&!>Th|a
zJ>NndW{wfW94D(6YnK4c0n<=(`q9m~pUta%rtH}p{!<Ev)CIi!HFh15hM8lG+nfpL
z=3Fv4`XKzD(Xp~u=`T)Od`XJE^*RJ*jtS75kRVrAASKCQqF}(KpIE}m+~C|VvN0`U
haoF=D=a{7v0~${>?G7=Nxy7gBXcs0qGizdaCII0-cB=pY

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/info/exclude b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ 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
new file mode 100644
index 000000000..3972ae2a1
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/HEAD
@@ -0,0 +1,8 @@
+0000000000000000000000000000000000000000 3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 CI <CI@example.com> 1654108479 +0200	commit (initial): myfile1
+3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <CI@example.com> 1654108479 +0200	commit: myfile2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 72ee6cc86de71389b9c70e24c7d8c8837e7d3566 CI <CI@example.com> 1654108479 +0200	commit: myfile3
+72ee6cc86de71389b9c70e24c7d8c8837e7d3566 b090d7f0029e74de260f7458721b8edd1e618edc CI <CI@example.com> 1654108479 +0200	commit: myfile4
+b090d7f0029e74de260f7458721b8edd1e618edc 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <CI@example.com> 1654108479 +0200	reset: moving to HEAD~2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 0000000000000000000000000000000000000000 CI <CI@example.com> 1654108482 +0200	Branch: renamed refs/heads/master to refs/heads/master-local
+0000000000000000000000000000000000000000 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <CI@example.com> 1654108482 +0200	Branch: renamed refs/heads/master to refs/heads/master-local
+12d38e54cd419303587ba4613fb1194ec5c9d04f b090d7f0029e74de260f7458721b8edd1e618edc CI <CI@example.com> 1654108482 +0200	pull --no-edit --ff-only origin master: Fast-forward
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local
new file mode 100644
index 000000000..b930bd5b6
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local
@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 CI <CI@example.com> 1654108479 +0200	commit (initial): myfile1
+3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <CI@example.com> 1654108479 +0200	commit: myfile2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 72ee6cc86de71389b9c70e24c7d8c8837e7d3566 CI <CI@example.com> 1654108479 +0200	commit: myfile3
+72ee6cc86de71389b9c70e24c7d8c8837e7d3566 b090d7f0029e74de260f7458721b8edd1e618edc CI <CI@example.com> 1654108479 +0200	commit: myfile4
+b090d7f0029e74de260f7458721b8edd1e618edc 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <CI@example.com> 1654108479 +0200	reset: moving to HEAD~2
+12d38e54cd419303587ba4613fb1194ec5c9d04f 12d38e54cd419303587ba4613fb1194ec5c9d04f CI <CI@example.com> 1654108482 +0200	Branch: renamed refs/heads/master to refs/heads/master-local
+12d38e54cd419303587ba4613fb1194ec5c9d04f b090d7f0029e74de260f7458721b8edd1e618edc CI <CI@example.com> 1654108482 +0200	pull --no-edit --ff-only origin master: Fast-forward
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master
new file mode 100644
index 000000000..3cb40d7d3
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b090d7f0029e74de260f7458721b8edd1e618edc CI <CI@example.com> 1654108479 +0200	fetch origin: storing head
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
new file mode 100644
index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e
GIT binary patch
literal 52
zcmb<m)YkO!4K*-JH83$SFg6T4vDWAG8Bf!ch+WS=#$UZ69k1lHxZ=}XJ(h~CCGo5b
Ijy?h}0Qz4PZU6uP

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
new file mode 100644
index 0000000000000000000000000000000000000000..f43085f4d25e6f6348f42abf8b72215d1e19bf8e
GIT binary patch
literal 149
zcmV;G0BZku0gaB$3c@fD20iB~au;Otw{1W~=&6sf+kU}<v86=Nx3`brb!HATt+g)A
zx*Sh!2ds1<I!U?EJOd?j2Irz2xcAJn_e#Y_$7YiquVw?1_(Ub>At4cxg9aiNnE>sQ
zYCn^*k#~EnyB$V*9mYF8Qnx2A(^_xVaf*)m*kyYrPh<{yOf~$OoBA!w6W;s)E5bVh
DYmG%8

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
new file mode 100644
index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@DUS(>~ZE#08nZNMgRZ+

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
new file mode 100644
index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422
GIT binary patch
literal 103
zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB
zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL
J8UTCqE3ZN5G4lWb

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591
new file mode 100644
index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9
GIT binary patch
literal 128
zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB
zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL
i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6
new file mode 100644
index 000000000..0b97b6ff4
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/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�,�
\ No newline at end of file
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566
new file mode 100644
index 000000000..7dccbe9b7
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/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
\ No newline at end of file
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
new file mode 100644
index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@Cg%x>`~^A08nuUMF0Q*

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
new file mode 100644
index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66
GIT binary patch
literal 77
zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%t<w5Si0x&U)9tbUm`-Ic=DYt1bDS{
jUqw-3#2~@*!>B=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc
new file mode 100644
index 0000000000000000000000000000000000000000..1862ebd3c3feafed14da69f01a205eedeea79ac1
GIT binary patch
literal 149
zcmV;G0BZku0gaA93c@fD06pgwxeKzJY<4#wBJ|W}#B_^-v86=N-`gj69cEza(%PeY
z%yj6RnGZ9g5G05S6m>?rA#>6a6Ps|Lm}*HG-C8z#buYn;YgL|1FlxT#Dqw-COj=c=
zm`r=huDttw+59m2^DtiRQ`-8pQ(fA{BPT*olI)KV0NhUZscwJju6^gn)5!e**OWNK
DU$IK2

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
new file mode 100644
index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@F5d}>}lpN08nuUO8@`>

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
new file mode 100644
index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@EH?>>`CU&08otwO#lD@

literal 0
HcmV?d00001

diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local
new file mode 100644
index 000000000..22e32850e
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local
@@ -0,0 +1 @@
+b090d7f0029e74de260f7458721b8edd1e618edc
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/remotes/origin/master
new file mode 100644
index 000000000..22e32850e
--- /dev/null
+++ b/test/integration/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
new file mode 100644
index 000000000..a5bce3fd2
--- /dev/null
+++ 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
new file mode 100644
index 000000000..180cf8328
--- /dev/null
+++ 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
new file mode 100644
index 000000000..df6b0d2bc
--- /dev/null
+++ 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
new file mode 100644
index 000000000..d234c5e05
--- /dev/null
+++ 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
new file mode 100644
index 000000000..eea17dc8d
--- /dev/null
+++ 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}]}
\ No newline at end of file
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/setup.sh b/test/integration/fetchRemoteBranchWithNonmatchingName/setup.sh
new file mode 100644
index 000000000..bd33f9f6d
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/setup.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+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 ./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
new file mode 100644
index 000000000..dffe129cd
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/test.json
@@ -0,0 +1 @@
+{ "description": "allow unsetting the upstream of the current branch", "speed": 10 }