go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-19 21:28:28 +02:00
Code Issues Releases Activity

update discard file changes test

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-05 10:44:04 +10:00
parent 828a2acd26
commit 2295407a45
24 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG
View File

@ -1 +1,23 @@
three
Merge branch 'conflict' into conflict_second
# Conflicts:
# added-them-changed-us.txt
# both-added.txt
# both-deleted.txt
# both-modded.txt
# changed-them-added-us.txt
# deleted-them.txt
# deleted-us.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/discardFileChanges/actual/.git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch conflict_second
# All conflicts fixed but you are still merging.
#

1
test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD
View File

@ -1 +0,0 @@
38b645bf2388b21695d22d7f673d87971a78e4ad

0
test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE
View File

10
test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG
View File

@ -1,10 +0,0 @@
Merge branch 'conflict' into conflict_second
# Conflicts:
# added-them-changed-us.txt
# both-added.txt
# both-deleted.txt
# both-modded.txt
# changed-them-added-us.txt
# deleted-them.txt
# deleted-us.txt

2
test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD
View File

@ -1 +1 @@
c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
3633f8c997d88e0c59202f498c8344da9da3aaf4

BIN
test/integration/discardFileChanges/expected/.git_keep/index
View File

Binary file not shown.

15
test/integration/discardFileChanges/expected/.git_keep/logs/HEAD
View File

@ -1,7 +1,8 @@
0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one
0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt
eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two
38b645bf2388b21695d22d7f673d87971a78e4ad 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 checkout: moving from conflict to conflict_second
0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt
698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three
c64dd6aea3efd197ed630dedc1ffb538d35c3fdb c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 reset: moving to conflict_second
0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 commit (initial): one
459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt
0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000 commit: two
837fbbc4ee6892b828a4a94be22c39814146aafb 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 checkout: moving from conflict to conflict_second
459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt
3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 commit: three
3633f8c997d88e0c59202f498c8344da9da3aaf4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 reset: moving to conflict_second
3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second

6
test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict
View File

@ -1,3 +1,3 @@
0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one
0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt
eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two
0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 commit (initial): one
459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt
0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000 commit: two

7
test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second
View File

@ -1,3 +1,4 @@
0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 branch: Created from conflict
0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt
698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three
0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 branch: Created from conflict
459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt
3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 commit: three
3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second

BIN
test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 Normal file
View File

Binary file not shown.

2
test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84
View File

@ -1,2 +0,0 @@
x�ÍA
Â@ @Q×sŠì ’¤cR¡ˆÐU�‘§”)x|{„n?~ª¥¼PäKÛÜ¡GÔtO¨KÐ̔ʔ£kvæEt¶·WÝ`šaœæ§ÿ¬¬¿¦Z@BÂØã� #B G=&ÍOòP¿þIÔ*Ê

2
test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 Normal file
View File

@ -0,0 +1,2 @@
xЌОНЉВ0ЕqЧyЉ»*IуХЂ ®|Њ$чФ
¦•zвё=ь9ькЦЪMhtъ ;@HЮ3‚Fґc°ОivБД„д"кTЖ¤G­zд«ђуiО^џgж2Ґl№VfМ6‹џ9:ЦОЁь’eЫй|ЎУщт‡wnЏ;Ћukїd‚‰~кЇ‘~ЊЦZхµЈ_жЄlІ Њ;|”·P§е¦ЫJuЙл<И‚6д.гбхьDкЦКK`

2
test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 Normal file
View File

@ -0,0 +1,2 @@
x�ÎM
Â0@a×9Eö‚äºê1f¦3([J�o�àöñ¯½?‡õ-œÆ.bsc‚ŠÚ©¦ê#19âJ@—¥_(�Ùp—÷°1$@e(Àªž[UÉÀ¹¬¥ä˜PpŠÉàg<ÖÝN³½Nó]¾Ø·—\xí7닇\C°gïœ3G=PCþÜÍxtóßí:L

BIN
test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad
View File

Binary file not shown.

BIN
test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7 Normal file
View File

Binary file not shown.

3
test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 Normal file
View File

@ -0,0 +1,3 @@
xŤÍÁ
Â0 €aĎ}ŠÜI˛šT�1ŘiŹ‘•kǨŕă»GđúóÁź[­ĎůÔww5ß2ęZš™ňJ…Šbt-nÂŁ�¦`źţh;Ě ÜçeňŻŐíĺ—Üę$¤×Ä�
ś ĂQŹI÷?yho?P*ň

BIN
test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74
View File

Binary file not shown.

BIN
test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb Normal file
View File

Binary file not shown.

2
test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb
View File

@ -1,2 +0,0 @@
x�ÎA
Â0@Q×9Eö‚ÌLÒd"BW=F&™ `l)<¾=‚ÛÏ_¼²öþ�Æ®j§TZ”ȹ¥œ…=£“" …E)¶Za³å]ßÆÄJè1…¦�E<j¥ÚœH.Ñ›ü�u·ób¯ór×oîÛK/eí7‹�ƒ‰ìÀõ@ ýs7ãqÐÍÛ':G

1
test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da
View File

@ -1 +0,0 @@
x�ŽAjÃ0E»Ö)f_F²$[PJ!«c$}Õ�Èîrü:7Èò=Þâ•­÷«’óü¡;@à9K.1[N�­mÞA²„6%DÄ4N˜Ì]v¬JŒPR«~œFW„£O>"•0»Vc³!M“¯yöFºl;�/ôu¾üà)ý~élý›l´ÑñÈÁÒ§µÌæ°Ç”âÍÜäM—¡âE=éSéX“ŽJו¤VÔAô¡,²þðø{EæVJK–

2
test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict
View File

@ -1 +1 @@
38b645bf2388b21695d22d7f673d87971a78e4ad
837fbbc4ee6892b828a4a94be22c39814146aafb

2
test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second
View File

@ -1 +1 @@
c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
39d62c8a07e5103fef16c32373738ce92c4549b7

2
test/integration/discardFileChanges/recording.json
View File

File diff suppressed because one or more lines are too long

2
test/integration/discardFileChanges/test.json
View File

@ -1 +1 @@
{ "description": "discard file changes for various kinds of situations (merge conflicts, etc)", "speed": 2 }
{ "description": "discard file changes for various kinds of situations (merge conflicts, etc)", "speed": 3 }