go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity

Fetch the correct remote branch

Browse Source
This commit is contained in:
Luka Markušić
2022-06-01 20:30:13 +02:00
parent f9a3188b56
commit 55a941d5dc
50 changed files with 112 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/COMMIT_EDITMSG Normal file
View File

@@ -0,0 +1 @@
myfile4

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/FETCH_HEAD Normal file
View File

@@ -0,0 +1 @@
b090d7f0029e74de260f7458721b8edd1e618edc branch 'master' of ../origin

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/HEAD Normal file
View File

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

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/ORIG_HEAD Normal file
View File

@@ -0,0 +1 @@
12d38e54cd419303587ba4613fb1194ec5c9d04f

14
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/config Normal file
View File

@@ -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

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/description Normal file
View File

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

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/index Normal file
View File

Binary file not shown.

6
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/info/exclude Normal file
View File

@@ -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]
# *~

8
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/HEAD Normal file
View File

@@ -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

7
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local Normal file
View File

@@ -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

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 b090d7f0029e74de260f7458721b8edd1e618edc CI <CI@example.com> 1654108479 +0200 fetch origin: storing head

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 Normal file
View File

Binary file not shown.

3
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 Normal file
View File

@@ -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�,�

2
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/72/ee6cc86de71389b9c70e24c7d8c8837e7d3566 Normal file
View File

@@ -0,0 +1,2 @@
x��A
� E��� �q�D!�BV9��#

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/b0/90d7f0029e74de260f7458721b8edd1e618edc Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 Normal file
View File

Binary file not shown.

BIN
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b Normal file
View File

Binary file not shown.

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/heads/master-local Normal file
View File

@@ -0,0 +1 @@
b090d7f0029e74de260f7458721b8edd1e618edc

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/refs/remotes/origin/master Normal file
View File

@@ -0,0 +1 @@
b090d7f0029e74de260f7458721b8edd1e618edc

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile1 Normal file
View File

@@ -0,0 +1 @@
test1

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile2 Normal file
View File

@@ -0,0 +1 @@
test2

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile3 Normal file
View File

@@ -0,0 +1 @@
test3

1
test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/myfile4 Normal file
View File

@@ -0,0 +1 @@
test4