sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

add integration test for discarding old files

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-09 14:04:49 +11:00
parent ceb927fec0
commit e5096e71ab
37 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
twoFiles

0
test/integration/discardOldFileChanges/expected/.git_keep/FETCH_HEAD Normal file
View File

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

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

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

@ -0,0 +1 @@
7880a9728615a4d196df39600a0c8c71b40d96d6

10
test/integration/discardOldFileChanges/expected/.git_keep/config Normal file
View File

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

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

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

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

Binary file not shown.

7
test/integration/discardOldFileChanges/expected/.git_keep/info/exclude Normal file
View File

@ -0,0 +1,7 @@
# 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]
# *~
.DS_Store

9
test/integration/discardOldFileChanges/expected/.git_keep/logs/HEAD Normal file
View File

@ -0,0 +1,9 @@
0000000000000000000000000000000000000000 b7a702b642978f2a9b1af9c1c67b22127af78c92 CI <CI@example.com> 1641697108 +1100 commit (initial): file0
b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI <CI@example.com> 1641697108 +1100 commit: twoFiles
7880a9728615a4d196df39600a0c8c71b40d96d6 af6725ba23f43a286deff0747476d7874113df1e CI <CI@example.com> 1641697108 +1100 commit: file2
af6725ba23f43a286deff0747476d7874113df1e af6725ba23f43a286deff0747476d7874113df1e CI <CI@example.com> 1641697111 +1100 rebase: updating HEAD
af6725ba23f43a286deff0747476d7874113df1e b7a702b642978f2a9b1af9c1c67b22127af78c92 CI <CI@example.com> 1641697111 +1100 rebase -i (start): checkout b7a702b642978f2a9b1af9c1c67b22127af78c92
b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI <CI@example.com> 1641697111 +1100 rebase -i: fast-forward
7880a9728615a4d196df39600a0c8c71b40d96d6 d14505f281a54cda96fc5fb8cd4b4ee14bae6264 CI <CI@example.com> 1641697111 +1100 commit (amend): twoFiles
d14505f281a54cda96fc5fb8cd4b4ee14bae6264 225ad83faa797c1831a2bc956a21e2d472f21443 CI <CI@example.com> 1641697111 +1100 rebase -i (pick): file2
225ad83faa797c1831a2bc956a21e2d472f21443 225ad83faa797c1831a2bc956a21e2d472f21443 CI <CI@example.com> 1641697111 +1100 rebase -i (finish): returning to refs/heads/master

4
test/integration/discardOldFileChanges/expected/.git_keep/logs/refs/heads/master Normal file
View File

@ -0,0 +1,4 @@
0000000000000000000000000000000000000000 b7a702b642978f2a9b1af9c1c67b22127af78c92 CI <CI@example.com> 1641697108 +1100 commit (initial): file0
b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI <CI@example.com> 1641697108 +1100 commit: twoFiles
7880a9728615a4d196df39600a0c8c71b40d96d6 af6725ba23f43a286deff0747476d7874113df1e CI <CI@example.com> 1641697108 +1100 commit: file2
af6725ba23f43a286deff0747476d7874113df1e 225ad83faa797c1831a2bc956a21e2d472f21443 CI <CI@example.com> 1641697111 +1100 rebase -i (finish): refs/heads/master onto b7a702b642978f2a9b1af9c1c67b22127af78c92

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 Normal file
View File

Binary file not shown.

1
test/integration/discardOldFileChanges/expected/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a Normal file
View File

@ -0,0 +1 @@
x<01><><EFBFBD>j1DS<44>W<EFBFBD><0F>]iO+<2B> <0C>\<5C>V<>D>s'C>?j҇<6A><D287><EFBFBD><18>n<EFBFBD>

2
test/integration/discardOldFileChanges/expected/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 Normal file
View File

@ -0,0 +1,2 @@
x<01><>A
<EFBFBD>0E]<5D><14>$<24><><EFBFBD>DD<44><44>z<EFBFBD>i2<69><32>iK<69><4B>㛍{y<><79><EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD>\<5C> <20><>.<02>%xJ<78><4A><<3C>A<EFBFBD>2<><13> <20><><07>6G<36><47>.KΎL?<3F><><EFBFBD><EFBFBD><EFBFBD>x<EFBFBD>$gM<67><4D>y<><79>]<5D>(<28>?<3F><><EFBFBD>0<EFBFBD>pƇ\<5C><>\<5C>Z<EFBFBD><5A>΢ <0B><>pF<70>Z<EFBFBD><5A>EU<45>SW<53><57><EFBFBD><EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>/1<> <0B>Z@<40>

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

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc Normal file
View File

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 Normal file
View File

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 Normal file
View File

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da Normal file
View File

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 Normal file
View File

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/78/80a9728615a4d196df39600a0c8c71b40d96d6 Normal file
View File

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f Normal file
View File

Binary file not shown.

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c Normal file
View File

Binary file not shown.

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

Binary file not shown.

3
test/integration/discardOldFileChanges/expected/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e Normal file
View File

@ -0,0 +1,3 @@
x<01><>A
<EFBFBD> @Ѯ=<3D><>B<EFBFBD><42>qT(<28><>U<EFBFBD>1<EFBFBD>#
<EFBFBD>& =~s<>n<>ekm<6B><16>p釪<05>,R<><52> ^kr<6B><72>̩xrN*)<29>])<29><>|<7C><><EFBFBD>#p

2
test/integration/discardOldFileChanges/expected/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 Normal file
View File

@ -0,0 +1,2 @@
x<01><>A
<EFBFBD>0Fa<46>9<EFBFBD><39><05><>c<EFBFBD><11><>#i<>`<60><>R"x|{<04><>޼<><DEBC>t<12>S<EFBFBD>\b6<62><36><EFBFBD>C*<02><><EFBFBD>V<EFBFBD><56>ToPS<50>.}<7D>k<EFBFBD>i<EFBFBD><69>>NO|S{<7B><><EFBFBD>[{<7B><04>`Qx<51><78><08>;<3B>1<EFBFBD><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`<60><03>7+<2B>

2
test/integration/discardOldFileChanges/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 Normal file
View File

@ -0,0 +1,2 @@
x+)JMU03c040031QH<51><48>I5`<60><10><><EFBFBD><EFBFBD><EFBFBD>ֶw<D6B6><77><EFBFBD>w.<2E><>h<EFBFBD>T<EFBFBD>[H
<19><>y<EFBFBD>W5<57>Ɨ<EFBFBD><C697>(<28>|<7C> ^-<2D>W(x9

BIN
test/integration/discardOldFileChanges/expected/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 Normal file
View File

Binary file not shown.

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

Binary file not shown.

1
test/integration/discardOldFileChanges/expected/.git_keep/refs/heads/master Normal file
View File

@ -0,0 +1 @@
225ad83faa797c1831a2bc956a21e2d472f21443

1
test/integration/discardOldFileChanges/expected/file0 Normal file
View File

@ -0,0 +1 @@
test0

1
test/integration/discardOldFileChanges/expected/file1 Normal file
View File

@ -0,0 +1 @@
test1

1
test/integration/discardOldFileChanges/expected/file2 Normal file
View File

@ -0,0 +1 @@
test2

1
test/integration/discardOldFileChanges/expected/file3 Normal file
View File

@ -0,0 +1 @@
test3

1
test/integration/discardOldFileChanges/recording.json Normal file
View File

@ -0,0 +1 @@
{"KeyEvents":[{"Timestamp":635,"Mod":0,"Key":259,"Ch":0},{"Timestamp":899,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1227,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1571,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1971,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2322,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2731,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3707,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

24
test/integration/discardOldFileChanges/setup.sh Normal file
View File

@ -0,0 +1,24 @@
#!/bin/sh
cd $1
git init
git config user.email "CI@example.com"
git config user.name "CI"
echo test0 > file0
git add .
git commit -am file0
echo test1 > file1
echo testZ > fileZ
git add .
git commit -am twoFiles
echo test2 > file2
git add .
git commit -am file2
echo test3 > file3
git add .

4
test/integration/discardOldFileChanges/test.json Normal file
View File

@ -0,0 +1,4 @@
{
"description": "Discarding a single file from an old commit (does rebase in background to remove the file but retain the other one)",
"speed": 5
}