From ae07cf55066b826261ef16b9e40334694831b8d7 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 28 Dec 2022 13:01:32 +1100 Subject: [PATCH] migrate discard old file change test --- .../tests/commit/discard_old_file_change.go | 57 ++++++++++++++++++ pkg/integration/tests/tests.go | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 10 --- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 334 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 --- .../expected/repo/.git_keep/logs/HEAD | 9 --- .../repo/.git_keep/logs/refs/heads/master | 4 -- .../00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 | Bin 127 -> 0 bytes .../0a/91dcf3772f7fd7409b3df04eb6ef177219303a | 1 - .../0c/db6daba7e25b6d6d10da326e0ab74401021370 | 2 - .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../18/e987d34afb121659724591cd709e2a789184fc | Bin 152 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../22/5ad83faa797c1831a2bc956a21e2d472f21443 | Bin 151 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../42/786aead9ca20a3427c38e5e5262fa787ce9868 | Bin 101 -> 0 bytes .../78/80a9728615a4d196df39600a0c8c71b40d96d6 | Bin 150 -> 0 bytes .../7b/8a8396be4352039598acb43acaadc1c380551f | Bin 21 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../af/6725ba23f43a286deff0747476d7874113df1e | 3 - .../b7/a702b642978f2a9b1af9c1c67b22127af78c92 | 2 - .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 | Bin 154 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../discardOldFileChanges/expected/repo/file0 | 1 - .../discardOldFileChanges/expected/repo/file1 | 1 - .../discardOldFileChanges/expected/repo/file2 | 1 - .../discardOldFileChanges/expected/repo/file3 | 1 - .../discardOldFileChanges/recording.json | 1 - .../discardOldFileChanges/setup.sh | 26 -------- .../discardOldFileChanges/test.json | 4 -- 38 files changed, 58 insertions(+), 80 deletions(-) create mode 100644 pkg/integration/tests/commit/discard_old_file_change.go delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/config delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/description delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/index delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/78/80a9728615a4d196df39600a0c8c71b40d96d6 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/discardOldFileChanges/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/discardOldFileChanges/expected/repo/file0 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/file1 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/file2 delete mode 100644 test/integration/discardOldFileChanges/expected/repo/file3 delete mode 100644 test/integration/discardOldFileChanges/recording.json delete mode 100644 test/integration/discardOldFileChanges/setup.sh delete mode 100644 test/integration/discardOldFileChanges/test.json diff --git a/pkg/integration/tests/commit/discard_old_file_change.go b/pkg/integration/tests/commit/discard_old_file_change.go new file mode 100644 index 000000000..735dcca87 --- /dev/null +++ b/pkg/integration/tests/commit/discard_old_file_change.go @@ -0,0 +1,57 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var DiscardOldFileChange = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Discarding a single file from an old commit (does rebase in background to remove the file but retain the other one)", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file0", "file0") + shell.Commit("first commit") + + shell.CreateFileAndAdd("file1", "file2") + shell.CreateFileAndAdd("fileToRemove", "fileToRemove") + shell.Commit("commit to change") + + shell.CreateFileAndAdd("file3", "file3") + shell.Commit("third commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("third commit").IsSelected(), + Contains("commit to change"), + Contains("first commit"), + ). + SelectNextItem(). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + Contains("fileToRemove"), + ). + SelectNextItem(). + Press(keys.Universal.Remove) + + t.ExpectPopup().Confirmation(). + Title(Equals("Discard file changes")). + Content(Contains("Are you sure you want to discard this commit's changes to this file?")). + Confirm() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ) + + t.FileSystem().PathNotPresent("fileToRemove") + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index d63b1aa50..c550c2a0c 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -45,6 +45,7 @@ var tests = []*components.IntegrationTest{ commit.Staged, commit.Unstaged, commit.StagedWithoutHooks, + commit.DiscardOldFileChange, custom_commands.Basic, custom_commands.FormPrompts, custom_commands.MenuFromCommand, diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/discardOldFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 7b27632fe..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -twoFiles diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index db70e637d..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7880a9728615a4d196df39600a0c8c71b40d96d6 diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/config b/test/integration/discardOldFileChanges/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/description b/test/integration/discardOldFileChanges/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/index b/test/integration/discardOldFileChanges/expected/repo/.git_keep/index deleted file mode 100644 index 258123f2690e46dffe3212b5b74b2f09985c5d23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmZ?q402{*U|<4bmc(2Bk&^v0+(5L1dhlyT1_oBfKYz3t7#f!_Ffe`vsu2NVHVYA} zD+~TbaR&OdHh#3 z^~RTo&?ugKrwajIE!|fk<`}}wk!i{>1)C?lVG`6FU37CKczzf)DD6A<#}Zg+uBBUj7=pjz~kyF$S9x l66ER%WUw*l8Y&oYxyU%ods+NGzS7%p&Yqrn>8H%RzX9AgX@CF# diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/info/exclude b/test/integration/discardOldFileChanges/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index cd7bc3c77..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 b7a702b642978f2a9b1af9c1c67b22127af78c92 CI 1641697108 +1100 commit (initial): file0 -b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI 1641697108 +1100 commit: twoFiles -7880a9728615a4d196df39600a0c8c71b40d96d6 af6725ba23f43a286deff0747476d7874113df1e CI 1641697108 +1100 commit: file2 -af6725ba23f43a286deff0747476d7874113df1e af6725ba23f43a286deff0747476d7874113df1e CI 1641697111 +1100 rebase: updating HEAD -af6725ba23f43a286deff0747476d7874113df1e b7a702b642978f2a9b1af9c1c67b22127af78c92 CI 1641697111 +1100 rebase -i (start): checkout b7a702b642978f2a9b1af9c1c67b22127af78c92 -b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI 1641697111 +1100 rebase -i: fast-forward -7880a9728615a4d196df39600a0c8c71b40d96d6 d14505f281a54cda96fc5fb8cd4b4ee14bae6264 CI 1641697111 +1100 commit (amend): twoFiles -d14505f281a54cda96fc5fb8cd4b4ee14bae6264 225ad83faa797c1831a2bc956a21e2d472f21443 CI 1641697111 +1100 rebase -i (pick): file2 -225ad83faa797c1831a2bc956a21e2d472f21443 225ad83faa797c1831a2bc956a21e2d472f21443 CI 1641697111 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 13413542d..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 b7a702b642978f2a9b1af9c1c67b22127af78c92 CI 1641697108 +1100 commit (initial): file0 -b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI 1641697108 +1100 commit: twoFiles -7880a9728615a4d196df39600a0c8c71b40d96d6 af6725ba23f43a286deff0747476d7874113df1e CI 1641697108 +1100 commit: file2 -af6725ba23f43a286deff0747476d7874113df1e 225ad83faa797c1831a2bc956a21e2d472f21443 CI 1641697111 +1100 rebase -i (finish): refs/heads/master onto b7a702b642978f2a9b1af9c1c67b22127af78c92 diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 deleted file mode 100644 index fd478c4af0b82b11f2e6efd8236e08e1d7775da8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDTrdI?rNU4&pC*B>Wnp8tWK>xc(@@{9sq4%IiFROJFox% diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a deleted file mode 100644 index 2794a5840..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a +++ /dev/null @@ -1 +0,0 @@ -xj1DSW]iO+ \VD>s'C>?j҇n Wzd9Vc\3{Z3VeSD.>~-C >Eրi&*'&Ġ 폇%aZԨ*G)L"qvwl?V0̈^/w͙r~K \ No newline at end of file diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 deleted file mode 100644 index 798edd72c..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]$DDzi2iK㛍{yZ\ .%xJ~ZE#08nZNMgRZ+ diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc deleted file mode 100644 index b09179f5f9e382c598ecd8335310a677adca174c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmV;J0B8Sr0V^p=O;s>7Gi5L|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F zDKKWZpUta%rtH}p{!9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 deleted file mode 100644 index f0e96277fe5213570b0eaf767739c2cad485060e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmV;I0BHYs0e#L*3c@fDKw;N8MfQSZ#{5h{MChu=m`o;EXlyAFJicAHcKi4iPuAAv zZehSv-&O6PM4Vg^DuksV*IY|*kfPQ^3PgC#f?_t__0??wA6%$Nz`;x5Ayx@BlN6u5 zD)`JAF?z%A{#|y2)08mZ`J^%m! diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 deleted file mode 100644 index 2f0336f2f78abe1d8b22fbc13b813ab9bd5c41c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gvEM3q+2lSYk0*S`pgIRggXS0cz946mmq>zzg0?tuDJS9Xx z;!Hsz8h*D&-RwBo^Eh4g%Vk~kB(+>D_#S*DaKRn{oHM)Kr<(qmoA#-;M1& diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f deleted file mode 100644 index 23756a36918446dfe237e35d6eb5086f74674bd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e deleted file mode 100644 index 44a1872c3..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e +++ /dev/null @@ -1,3 +0,0 @@ -xA - @Ѯ=BqT(U1# & =~snekmp釪,R ^kr̩xrN*)])|#p -C$<LTK Qid_aާ_n7"H) D{E0S]M]V9n \ No newline at end of file diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 deleted file mode 100644 index 8bcfe2c70..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0Fa9c#i`R"x|{޼tS\b6C*VToPS.}ki>NO|S{[{`Qx;1`7+ \ No newline at end of file diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 deleted file mode 100644 index 76e9da484fa451ad77e216da9664407a28edf23b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0ey}^3c@fD06pgwxeJorrr9ot2nC_f*lZIlw5HUEKHnZZdmV;hv@FY1 zEpU6NTS|6x6jWK&v8V`+O~_G6xXojeuyMh&4<5`aTY6L*NyuRg9+|p~!Vx61f(D9+ zfFzkZWi;}t_p;f3u;+fbrjIP^oK9Mni-o-xn80=R2;iLA={{A{e;weboBA%dX--e` I1xdL(2iG!4r~m)} diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/discardOldFileChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/discardOldFileChanges/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 2ebac56f2..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -225ad83faa797c1831a2bc956a21e2d472f21443 diff --git a/test/integration/discardOldFileChanges/expected/repo/file0 b/test/integration/discardOldFileChanges/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/discardOldFileChanges/expected/repo/file1 b/test/integration/discardOldFileChanges/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/discardOldFileChanges/expected/repo/file2 b/test/integration/discardOldFileChanges/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/discardOldFileChanges/expected/repo/file3 b/test/integration/discardOldFileChanges/expected/repo/file3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/discardOldFileChanges/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/discardOldFileChanges/recording.json b/test/integration/discardOldFileChanges/recording.json deleted file mode 100644 index 0b9a99ec5..000000000 --- a/test/integration/discardOldFileChanges/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"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}]} \ No newline at end of file diff --git a/test/integration/discardOldFileChanges/setup.sh b/test/integration/discardOldFileChanges/setup.sh deleted file mode 100644 index 5b592cabd..000000000 --- a/test/integration/discardOldFileChanges/setup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -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 . diff --git a/test/integration/discardOldFileChanges/test.json b/test/integration/discardOldFileChanges/test.json deleted file mode 100644 index 04a59a63c..000000000 --- a/test/integration/discardOldFileChanges/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Discarding a single file from an old commit (does rebase in background to remove the file but retain the other one)", - "speed": 5 -}