mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix ambiguous branch name

Browse source 
test: add an integration test for checkout branch by name

fix: fix full ref name of detached head

refactor: refactor current branch loader

chore: use field name explicitly
This commit is contained in:
Ryooooooga 2022-10-16 21:31:42 +09:00 • committed by Jesse Duffield
parent b33ec5a050
commit 52a2e4c1dc
39 changed files with 150 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/COMMIT_EDITMSG Normal file
View file

@ -0,0 +1 @@
blah

0
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/FETCH_HEAD Normal file
View file

1
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/HEAD Normal file
View file

@ -0,0 +1 @@
ref: refs/heads/new-branch

0
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/commit-template.txt Normal file
View file

12
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/config Normal file
View file

@ -0,0 +1,12 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI
[commit]
gpgSign = false

1
test/integration_new/branch/checkout_by_name/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_new/branch/checkout_by_name/expected/repo/.git_keep/index Normal file
View file

Binary file not shown.

0
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/info/exclude Normal file
View file

7
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/HEAD Normal file
View file

@ -0,0 +1,7 @@
0000000000000000000000000000000000000000 95efd4ea6ed74b904cd8eeeaa6245ec462372f67 CI <CI@example.com> 1665924398 +0900 commit (initial): commit 01
95efd4ea6ed74b904cd8eeeaa6245ec462372f67 cfc66e0e89b1dc11a927cc453dbee025ff03cf83 CI <CI@example.com> 1665924398 +0900 commit: commit 02
cfc66e0e89b1dc11a927cc453dbee025ff03cf83 6d69ac71e12a83769fca195d0a714435e1f4661a CI <CI@example.com> 1665924398 +0900 commit: commit 03
6d69ac71e12a83769fca195d0a714435e1f4661a 6d69ac71e12a83769fca195d0a714435e1f4661a CI <CI@example.com> 1665924398 +0900 checkout: moving from master to @
6d69ac71e12a83769fca195d0a714435e1f4661a 6d69ac71e12a83769fca195d0a714435e1f4661a CI <CI@example.com> 1665924398 +0900 checkout: moving from @ to master
6d69ac71e12a83769fca195d0a714435e1f4661a 18565748bda3ca01a67a92f340705af5a11384ae CI <CI@example.com> 1665924398 +0900 commit: blah
18565748bda3ca01a67a92f340705af5a11384ae 6d69ac71e12a83769fca195d0a714435e1f4661a CI <CI@example.com> 1665924403 +0900 checkout: moving from master to new-branch

1
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/@ Normal file
View file

@ -0,0 +1 @@
0000000000000000000000000000000000000000 6d69ac71e12a83769fca195d0a714435e1f4661a CI <CI@example.com> 1665924398 +0900 branch: Created from HEAD

4
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/master Normal file
View file

@ -0,0 +1,4 @@
0000000000000000000000000000000000000000 95efd4ea6ed74b904cd8eeeaa6245ec462372f67 CI <CI@example.com> 1665924398 +0900 commit (initial): commit 01
95efd4ea6ed74b904cd8eeeaa6245ec462372f67 cfc66e0e89b1dc11a927cc453dbee025ff03cf83 CI <CI@example.com> 1665924398 +0900 commit: commit 02
cfc66e0e89b1dc11a927cc453dbee025ff03cf83 6d69ac71e12a83769fca195d0a714435e1f4661a CI <CI@example.com> 1665924398 +0900 commit: commit 03
6d69ac71e12a83769fca195d0a714435e1f4661a 18565748bda3ca01a67a92f340705af5a11384ae CI <CI@example.com> 1665924398 +0900 commit: blah

1
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/new-branch Normal file
View file

@ -0,0 +1 @@
0000000000000000000000000000000000000000 6d69ac71e12a83769fca195d0a714435e1f4661a CI <CI@example.com> 1665924403 +0900 branch: Created from refs/heads/@

BIN
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 Normal file
View file

Binary file not shown.

3
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/18/565748bda3ca01a67a92f340705af5a11384ae Normal file
View file

@ -0,0 +1,3 @@
x<01>ÎM
Â0@a×9Eö‚dò3Í€ˆÐU<C390>1I&ThL)<¾=‚Û<E2809A>·x¹·ö.ãÑ‚%A 1Û”‚pñ`<q”êŒC#§Y«v>ä=4$ÎXŽnBª™<C2AA>B1<<3C>÷.T<>¬ø3Ö~èyÑ÷yyÊ—Û¾É-÷öЀÈzGQ_ £N=§†ü™«´ñª~\
9f

BIN
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca Normal file
View file

Binary file not shown.

BIN
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc Normal file
View file

Binary file not shown.

BIN
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 Normal file
View file

Binary file not shown.

3
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/6d/69ac71e12a83769fca195d0a714435e1f4661a Normal file
View file

@ -0,0 +1,3 @@
x<01>Î=
1@aëœbzAfògD„­öÉd‚‚q—%‚Çw `ûøŠ'Kï<4B>Äñ06UÐX µ<>Ä–4WOè9'mŽ ]DÝ›%µfÍ›¾H“5q¡*D™íYÄW‹*ÚÐ:iÉ™ü÷eƒi†Ë4ßô“ûúÔ“,ý
c`ë'8"#š½îSCÿä?èÌ;û

BIN
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/95/efd4ea6ed74b904cd8eeeaa6245ec462372f67 Normal file
View file

Binary file not shown.

BIN
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b Normal file
View file

Binary file not shown.

3
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/cf/c66e0e89b1dc11a927cc453dbee025ff03cf83 Normal file
View file

@ -0,0 +1,3 @@
x<01>ÎA
1 @Q×=Eö‚´™4mAD˜•ÇHÛë C<05>ï,<€ÛÏ[ü²ôþàƦ
b±Pž8s¬-ØèœGŒXšÉErÈHÊ)›U6} H^[%Ö('K¥FUa$¯…§€<C2A7>ƒ‘÷¸/Ì78Ï·«~¤¯O=•¥_À1û„4¥G›¬5{ݧ†þÉ,š/×[;ª

BIN
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 Normal file
View file

Binary file not shown.

1
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/@ Normal file
View file

@ -0,0 +1 @@
6d69ac71e12a83769fca195d0a714435e1f4661a

1
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/master Normal file
View file

@ -0,0 +1 @@
18565748bda3ca01a67a92f340705af5a11384ae

1
test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/new-branch Normal file
View file

@ -0,0 +1 @@
6d69ac71e12a83769fca195d0a714435e1f4661a

1
test/integration_new/branch/checkout_by_name/expected/repo/file01.txt Normal file
View file

@ -0,0 +1 @@
file01 content

1
test/integration_new/branch/checkout_by_name/expected/repo/file02.txt Normal file
View file

@ -0,0 +1 @@
file02 content

1
test/integration_new/branch/checkout_by_name/expected/repo/file03.txt Normal file
View file

@ -0,0 +1 @@
file03 content