summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-06-09 20:12:56 +1000
committerGitHub <noreply@github.com>2022-06-09 20:12:56 +1000
commitcdec70cc0688b7c3bd0a2e74c924b7e91db558e7 (patch)
treed6654d4c23b0ec52a2b64f3657b614a87a20adac /test
parent24e3afbb56c880371a6ffcaf9c1c2f322833dd81 (diff)
parent55a941d5dc457b0f78f04a7bbf6caea93b732fa8 (diff)
Merge pull request #1975 from mark2185/fix-unmatching-remote-branch-name
Diffstat (limited to 'test')
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/HEAD1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/config6
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/description1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/info/exclude6
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04fbin0 -> 149 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591bin0 -> 128 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b63
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d35662
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/b0/90d7f0029e74de260f7458721b8edd1e618edcbin0 -> 149 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/packed-refs2
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/FETCH_HEAD1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/config14
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/description1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/indexbin0 -> 353 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/info/exclude6
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/HEAD8
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local7
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04fbin0 -> 149 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591bin0 -> 128 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b63
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d35662
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/b0/90d7f0029e74de260f7458721b8edd1e618edcbin0 -> 149 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/remotes/origin/master1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile11
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile21
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile31
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile41
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/recording.json1
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/setup.sh36
-rw-r--r--test/integration/fetchRemoteBranchWithNonmatchingName/test.json1
49 files changed, 111 insertions, 0 deletions
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 000000000..7f2ebf4ee
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
Binary files differ
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 000000000..f43085f4d
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
Binary files differ
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 000000000..f74bf2335
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Binary files differ
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 000000000..0a734f981
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
Binary files differ
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 000000000..31ae3f5ba
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591
Binary files differ
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 @@
+xA
+0@Q9I
+"BW=FL!R"~r*Jd ¬DjE<xvfMC?^^r; L9pFzLɝ})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 @@
+xA
+ E qD!BV9# & yyum])m !HXJ̀ ɢxʫ6G t~L.$ z^4/zlr5 xkm?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 000000000..285df3e5f
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
Binary files differ
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 000000000..96d2e71a6
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
Binary files differ
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 000000000..1862ebd3c
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc
Binary files differ
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 000000000..d39fa7d2f
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
Binary files differ
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 000000000..9b771fc2f
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
Binary files differ
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 000000000..3dd393021
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/index
Binary files differ
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 000000000..7f2ebf4ee
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
Binary files differ
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 000000000..f43085f4d
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f
Binary files differ
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 000000000..f74bf2335
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
Binary files differ
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 000000000..0a734f981
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
Binary files differ
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 000000000..31ae3f5ba
--- /dev/null
+++ b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591
Binary files differ
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 @@
+xA
+0@Q9I
+"BW=FL!R"~r*Jd ¬DjE<xvfMC?^^r; L9pFzLɝ})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 @@
+xA
+ E qD!BV9# & yyum])m !HXJ̀ ɢxʫ6G t~L.$ z^4/zlr5 xkm?O\oY7A?:l \ No newline at end of file
diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integr