From 0ac869a415ee446746fa8a12d9c2e7a8f0e48634 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 13:38:07 +1100 Subject: [PATCH 01/11] allow syncing tests from vscode --- .vscode/tasks.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 5be637f47..f0d10c7e4 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -69,6 +69,18 @@ "presentation": { "focus": true } - } + }, + { + "label": "Sync tests list", + "type": "shell", + "command": "go generate ./...", + "problemMatcher": [], + "group": { + "kind": "test", + }, + "presentation": { + "focus": true + } + }, ], } From 31d796ee750526a0d50d2e8665b104eb9edf1de6 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 13:38:15 +1100 Subject: [PATCH 02/11] migrate forcePush integration test --- pkg/integration/components/views.go | 4 ++ pkg/integration/tests/sync/force_push.go | 58 ++++++++++++++++++ pkg/integration/tests/tests_gen.go | 1 + .../forcePush/expected/origin/HEAD | 1 - .../forcePush/expected/origin/config | 8 --- .../forcePush/expected/origin/description | 1 - .../forcePush/expected/origin/info/exclude | 7 --- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../55/58e3589b913d8280499a5f9bf698971a83c5bd | Bin 121 -> 0 bytes .../77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../b8/568c2ecaef7e2f47647057ad47b040e8c5df53 | 2 - .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 103 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e3/8b0dbe9634034957d8ebe0088587abd9ae938d | Bin 149 -> 0 bytes .../forcePush/expected/origin/packed-refs | 2 - .../expected/origin/refs/heads/master | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 1 - .../forcePush/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../forcePush/expected/repo/.git_keep/config | 16 ----- .../expected/repo/.git_keep/description | 1 - .../forcePush/expected/repo/.git_keep/index | Bin 281 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 --- .../expected/repo/.git_keep/logs/HEAD | 5 -- .../repo/.git_keep/logs/refs/heads/master | 5 -- .../.git_keep/logs/refs/remotes/origin/master | 3 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../55/58e3589b913d8280499a5f9bf698971a83c5bd | Bin 121 -> 0 bytes .../77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../b8/568c2ecaef7e2f47647057ad47b040e8c5df53 | 2 - .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 103 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e3/8b0dbe9634034957d8ebe0088587abd9ae938d | Bin 149 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../forcePush/expected/repo/myfile1 | 1 - .../forcePush/expected/repo/myfile2 | 1 - .../forcePush/expected/repo/myfile4 | 1 - test/integration/forcePush/recording.json | 1 - test/integration/forcePush/setup.sh | 41 ------------- test/integration/forcePush/test.json | 1 - 52 files changed, 63 insertions(+), 117 deletions(-) create mode 100644 pkg/integration/tests/sync/force_push.go delete mode 100644 test/integration/forcePush/expected/origin/HEAD delete mode 100644 test/integration/forcePush/expected/origin/config delete mode 100644 test/integration/forcePush/expected/origin/description delete mode 100644 test/integration/forcePush/expected/origin/info/exclude delete mode 100644 test/integration/forcePush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/forcePush/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/forcePush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/forcePush/expected/origin/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd delete mode 100644 test/integration/forcePush/expected/origin/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 delete mode 100644 test/integration/forcePush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/forcePush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/forcePush/expected/origin/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 delete mode 100644 test/integration/forcePush/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 delete mode 100644 test/integration/forcePush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/forcePush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/forcePush/expected/origin/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d delete mode 100644 test/integration/forcePush/expected/origin/packed-refs delete mode 100644 test/integration/forcePush/expected/origin/refs/heads/master delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/config delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/description delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/index delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/forcePush/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/forcePush/expected/repo/myfile1 delete mode 100644 test/integration/forcePush/expected/repo/myfile2 delete mode 100644 test/integration/forcePush/expected/repo/myfile4 delete mode 100644 test/integration/forcePush/recording.json delete mode 100644 test/integration/forcePush/setup.sh delete mode 100644 test/integration/forcePush/test.json diff --git a/pkg/integration/components/views.go b/pkg/integration/components/views.go index 5641f1cd4..4c8002469 100644 --- a/pkg/integration/components/views.go +++ b/pkg/integration/components/views.go @@ -72,6 +72,10 @@ func (self *Views) Branches() *ViewDriver { return self.byName("localBranches") } +func (self *Views) Remotes() *ViewDriver { + return self.byName("remotes") +} + func (self *Views) RemoteBranches() *ViewDriver { return self.byName("remoteBranches") } diff --git a/pkg/integration/tests/sync/force_push.go b/pkg/integration/tests/sync/force_push.go new file mode 100644 index 000000000..dc24be199 --- /dev/null +++ b/pkg/integration/tests/sync/force_push.go @@ -0,0 +1,58 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ForcePush = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push to a remote with new commits, requiring a force push", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.Git.AutoFetch = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + + shell.CloneIntoRemote("origin") + shell.SetBranchUpstream("master", "origin/master") + + // remove the 'two' commit so that we have something to pull from the remote + shell.HardReset("HEAD^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓1 repo → master")) + + t.Views().Files().IsFocused().Press(keys.Universal.Push) + + t.ExpectPopup().Confirmation(). + Title(Equals("Force push")). + Content(Equals("Your branch has diverged from the remote branch. Press 'esc' to cancel, or 'enter' to force push.")). + Confirm() + + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Status().Content(Contains("✓ repo → master")) + + t.Views().Remotes().Focus(). + Lines(Contains("origin")). + PressEnter() + + t.Views().RemoteBranches().IsFocused(). + Lines(Contains("master")). + PressEnter() + + t.Views().SubCommits().IsFocused(). + Lines(Contains("one")) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 5fcc42ff2..ef6ed229b 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -72,6 +72,7 @@ var tests = []*components.IntegrationTest{ submodule.Remove, submodule.Reset, sync.FetchPrune, + sync.ForcePush, sync.Pull, sync.PullAndSetUpstream, sync.RenameBranchAndPull, diff --git a/test/integration/forcePush/expected/origin/HEAD b/test/integration/forcePush/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/forcePush/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/forcePush/expected/origin/config b/test/integration/forcePush/expected/origin/config deleted file mode 100644 index 5b015dc91..000000000 --- a/test/integration/forcePush/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePush/actual/./repo diff --git a/test/integration/forcePush/expected/origin/description b/test/integration/forcePush/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/forcePush/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/forcePush/expected/origin/info/exclude b/test/integration/forcePush/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/forcePush/expected/origin/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/forcePush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/forcePush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/forcePush/expected/origin/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd b/test/integration/forcePush/expected/origin/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd deleted file mode 100644 index 901f430029d2e4a3fe6ccfe3378f4c1b51549a7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0gcT;3WG2ZK+&#qirE*+OdQ7ur4(FwjF?QQ;1H1%+S}J7bo+VmQ#D%~ z5X+?n~V3cJTHDqR`AUTkaR0dwS%fcn5-n;m2uX?~V!+n~c`iZu0dP~(FK*FKx bJ>m#gB1CuAbJFxr?(AFEP09TLFwrc`~^A08nuUMF0Q* diff --git a/test/integration/forcePush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/forcePush/expected/origin/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 b/test/integration/forcePush/expected/origin/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 deleted file mode 100644 index f83e70de7..000000000 --- a/test/integration/forcePush/expected/origin/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E] ɤDzd:cK7Gp|j]N@D P1C_C^(y!֔t ^'H1L&c;44 ofa w.3s~ɟ_]e-;7 \ No newline at end of file diff --git a/test/integration/forcePush/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePush/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d3548aa14bca5d35e0871b31e326387c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD diff --git a/test/integration/forcePush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/forcePush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePush/expected/origin/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/forcePush/expected/origin/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d b/test/integration/forcePush/expected/origin/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d deleted file mode 100644 index 5b7d7cee708757cd1d96ea7b95db3d5b0532a998..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}%cLGI(u6m3~I)jDAmJ&g4Z;#;i@gBUowYGE( z*tScMzn7}yiC(dxA8Px`x4N~vhUn1+YfRQx0Atii&#BIT>Z*NZS=p-}DwaCt DnL4Z)S$HQ+{;yq!mIjQ zUTM#_P=}dg1T{yNRm~V=4v2=DGZEdKOD0Djg#R--R`x3W#c7K#NwK$HhrrA+0h$vM z( diff --git a/test/integration/forcePush/expected/repo/.git_keep/info/exclude b/test/integration/forcePush/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/forcePush/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/forcePush/expected/repo/.git_keep/logs/HEAD b/test/integration/forcePush/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index bccf225e5..000000000 --- a/test/integration/forcePush/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 5558e3589b913d8280499a5f9bf698971a83c5bd CI 1648352009 +1100 commit (initial): myfile1 -5558e3589b913d8280499a5f9bf698971a83c5bd 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 commit: myfile2 -77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b8568c2ecaef7e2f47647057ad47b040e8c5df53 CI 1648352009 +1100 commit: myfile3 -b8568c2ecaef7e2f47647057ad47b040e8c5df53 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 reset: moving to HEAD^ -77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 e38b0dbe9634034957d8ebe0088587abd9ae938d CI 1648352009 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/forcePush/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index bccf225e5..000000000 --- a/test/integration/forcePush/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 5558e3589b913d8280499a5f9bf698971a83c5bd CI 1648352009 +1100 commit (initial): myfile1 -5558e3589b913d8280499a5f9bf698971a83c5bd 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 commit: myfile2 -77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b8568c2ecaef7e2f47647057ad47b040e8c5df53 CI 1648352009 +1100 commit: myfile3 -b8568c2ecaef7e2f47647057ad47b040e8c5df53 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 reset: moving to HEAD^ -77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 e38b0dbe9634034957d8ebe0088587abd9ae938d CI 1648352009 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePush/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 006c9dee8..000000000 --- a/test/integration/forcePush/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 fetch origin: storing head -77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b8568c2ecaef7e2f47647057ad47b040e8c5df53 CI 1648352009 +1100 update by push -b8568c2ecaef7e2f47647057ad47b040e8c5df53 e38b0dbe9634034957d8ebe0088587abd9ae938d CI 1648352011 +1100 update by push diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd b/test/integration/forcePush/expected/repo/.git_keep/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd deleted file mode 100644 index 901f430029d2e4a3fe6ccfe3378f4c1b51549a7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0gcT;3WG2ZK+&#qirE*+OdQ7ur4(FwjF?QQ;1H1%+S}J7bo+VmQ#D%~ z5X+?n~V3cJTHDqR`AUTkaR0dwS%fcn5-n;m2uX?~V!+n~c`iZu0dP~(FK*FKx bJ>m#gB1CuAbJFxr?(AFEP09TLFwrc`~^A08nuUMF0Q* diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 b/test/integration/forcePush/expected/repo/.git_keep/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 deleted file mode 100644 index f83e70de7..000000000 --- a/test/integration/forcePush/expected/repo/.git_keep/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E] ɤDzd:cK7Gp|j]N@D P1C_C^(y!֔t ^'H1L&c;44 ofa w.3s~ɟ_]e-;7 \ No newline at end of file diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePush/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d3548aa14bca5d35e0871b31e326387c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePush/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/forcePush/expected/repo/.git_keep/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d b/test/integration/forcePush/expected/repo/.git_keep/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d deleted file mode 100644 index 5b7d7cee708757cd1d96ea7b95db3d5b0532a998..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}%cLGI(u6m3~I)jDAmJ&g4Z;#;i@gBUowYGE( z*tScMzn7}yiC(dxA8Px`x4N~vhUn1+YfRQx0Atii&#BIT>Z*NZS=p-}DwaCt Dn myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo origin - -cd repo - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -echo test3 > myfile3 -git add . -git commit -am "myfile3" - -git push origin master - -git reset --hard HEAD^ - -echo test4 > myfile4 -git add . -git commit -am "myfile4" - diff --git a/test/integration/forcePush/test.json b/test/integration/forcePush/test.json deleted file mode 100644 index 42519ead4..000000000 --- a/test/integration/forcePush/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "force push with lease if required", "speed": 10 } From 7201a91b69a18c974bf2ac2f16eeff6d69bd3eeb Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 13:51:34 +1100 Subject: [PATCH 03/11] remove unneeded config setting --- pkg/integration/tests/sync/force_push.go | 4 +--- pkg/integration/tests/sync/pull.go | 4 +--- pkg/integration/tests/sync/pull_and_set_upstream.go | 4 +--- pkg/integration/tests/sync/rename_branch_and_pull.go | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkg/integration/tests/sync/force_push.go b/pkg/integration/tests/sync/force_push.go index dc24be199..32b094737 100644 --- a/pkg/integration/tests/sync/force_push.go +++ b/pkg/integration/tests/sync/force_push.go @@ -9,9 +9,7 @@ var ForcePush = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Push to a remote with new commits, requiring a force push", ExtraCmdArgs: "", Skip: false, - SetupConfig: func(config *config.AppConfig) { - config.UserConfig.Git.AutoFetch = false - }, + SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.EmptyCommit("one") shell.EmptyCommit("two") diff --git a/pkg/integration/tests/sync/pull.go b/pkg/integration/tests/sync/pull.go index d33f4687d..453740b96 100644 --- a/pkg/integration/tests/sync/pull.go +++ b/pkg/integration/tests/sync/pull.go @@ -9,9 +9,7 @@ var Pull = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Pull a commit from the remote", ExtraCmdArgs: "", Skip: false, - SetupConfig: func(config *config.AppConfig) { - config.UserConfig.Git.AutoFetch = false - }, + SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.EmptyCommit("one") shell.EmptyCommit("two") diff --git a/pkg/integration/tests/sync/pull_and_set_upstream.go b/pkg/integration/tests/sync/pull_and_set_upstream.go index da3211154..93343492c 100644 --- a/pkg/integration/tests/sync/pull_and_set_upstream.go +++ b/pkg/integration/tests/sync/pull_and_set_upstream.go @@ -9,9 +9,7 @@ var PullAndSetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Pull a commit from the remote, setting the upstream branch in the process", ExtraCmdArgs: "", Skip: false, - SetupConfig: func(config *config.AppConfig) { - config.UserConfig.Git.AutoFetch = false - }, + SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.EmptyCommit("one") shell.EmptyCommit("two") diff --git a/pkg/integration/tests/sync/rename_branch_and_pull.go b/pkg/integration/tests/sync/rename_branch_and_pull.go index 9c60988e9..57968373d 100644 --- a/pkg/integration/tests/sync/rename_branch_and_pull.go +++ b/pkg/integration/tests/sync/rename_branch_and_pull.go @@ -9,9 +9,7 @@ var RenameBranchAndPull = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Rename a branch to no longer match its upstream, then pull from the upstream", ExtraCmdArgs: "", Skip: false, - SetupConfig: func(config *config.AppConfig) { - config.UserConfig.Git.AutoFetch = false - }, + SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.EmptyCommit("one") shell.EmptyCommit("two") From 76a1b501f270e15cca37a54f64dbbee41ce37648 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 13:51:45 +1100 Subject: [PATCH 04/11] migrate more force push tests --- .../sync/force_push_multiple_matching.go | 53 +++++++++++++ .../sync/force_push_multiple_upstream.go | 71 ++++++++++++++++++ pkg/integration/tests/tests_gen.go | 2 + .../expected/origin/HEAD | 1 - .../expected/origin/config | 8 -- .../expected/origin/description | 1 - .../expected/origin/info/exclude | 7 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../7a/35f0bb6bd8dc18ae462465e51f02362ba6babe | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../bd/739fb752ed02ccd49422196e31599c87ff90ad | Bin 149 -> 0 bytes .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 103 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e6/7f344f42afdb79c87a590f22537160241d8d61 | Bin 150 -> 0 bytes .../fe/67c3eaf819025990d3688d5f147a064e669ca5 | Bin 150 -> 0 bytes .../expected/origin/packed-refs | 3 - .../expected/origin/refs/heads/master | 1 - .../expected/origin/refs/heads/other_branch | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 2 - .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 21 ------ .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 10 --- .../repo/.git_keep/logs/refs/heads/master | 4 - .../.git_keep/logs/refs/heads/other_branch | 3 - .../.git_keep/logs/refs/remotes/origin/master | 3 - .../logs/refs/remotes/origin/other_branch | 3 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../7a/35f0bb6bd8dc18ae462465e51f02362ba6babe | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../bd/739fb752ed02ccd49422196e31599c87ff90ad | Bin 149 -> 0 bytes .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 103 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e6/7f344f42afdb79c87a590f22537160241d8d61 | Bin 150 -> 0 bytes .../fe/67c3eaf819025990d3688d5f147a064e669ca5 | Bin 150 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/other_branch | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../refs/remotes/origin/other_branch | 1 - .../expected/repo/myfile1 | 1 - .../expected/repo/myfile2 | 1 - .../forcePushMultipleMatching/recording.json | 1 - .../forcePushMultipleMatching/setup.sh | 54 ------------- .../forcePushMultipleMatching/test.json | 4 - .../expected/origin/HEAD | 1 - .../expected/origin/config | 8 -- .../expected/origin/description | 1 - .../expected/origin/info/exclude | 7 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../48/6301f318c84045827013a3c3246b8c6a319eb8 | Bin 148 -> 0 bytes .../49/ea44f3ec1792142714930c8e4c3073f137936c | Bin 150 -> 0 bytes .../81/bdc116083cd4b4655333f4eb94dc0320197082 | 3 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../c8/4375dda9d81c1f2103defe4384e31f859dac86 | 5 -- .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 103 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/origin/packed-refs | 3 - .../expected/origin/refs/heads/master | 1 - .../expected/origin/refs/heads/other_branch | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 2 - .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 21 ------ .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 10 --- .../repo/.git_keep/logs/refs/heads/master | 4 - .../.git_keep/logs/refs/heads/other_branch | 3 - .../.git_keep/logs/refs/remotes/origin/master | 3 - .../logs/refs/remotes/origin/other_branch | 2 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../48/6301f318c84045827013a3c3246b8c6a319eb8 | Bin 148 -> 0 bytes .../49/ea44f3ec1792142714930c8e4c3073f137936c | Bin 150 -> 0 bytes .../81/bdc116083cd4b4655333f4eb94dc0320197082 | 3 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../c8/4375dda9d81c1f2103defe4384e31f859dac86 | 5 -- .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 103 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/other_branch | 1 - .../repo/.git_keep/refs/remotes/origin/master | 1 - .../refs/remotes/origin/other_branch | 1 - .../expected/repo/myfile1 | 1 - .../expected/repo/myfile2 | 1 - .../forcePushMultipleUpstream/recording.json | 1 - .../forcePushMultipleUpstream/setup.sh | 54 ------------- .../forcePushMultipleUpstream/test.json | 4 - 109 files changed, 126 insertions(+), 307 deletions(-) create mode 100644 pkg/integration/tests/sync/force_push_multiple_matching.go create mode 100644 pkg/integration/tests/sync/force_push_multiple_upstream.go delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/HEAD delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/config delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/description delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/info/exclude delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/packed-refs delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master delete mode 100644 test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/description delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/index delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/myfile1 delete mode 100644 test/integration/forcePushMultipleMatching/expected/repo/myfile2 delete mode 100644 test/integration/forcePushMultipleMatching/recording.json delete mode 100644 test/integration/forcePushMultipleMatching/setup.sh delete mode 100644 test/integration/forcePushMultipleMatching/test.json delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/HEAD delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/config delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/description delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/info/exclude delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936c delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/packed-refs delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master delete mode 100644 test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/description delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/index delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936c delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/myfile1 delete mode 100644 test/integration/forcePushMultipleUpstream/expected/repo/myfile2 delete mode 100644 test/integration/forcePushMultipleUpstream/recording.json delete mode 100644 test/integration/forcePushMultipleUpstream/setup.sh delete mode 100644 test/integration/forcePushMultipleUpstream/test.json diff --git a/pkg/integration/tests/sync/force_push_multiple_matching.go b/pkg/integration/tests/sync/force_push_multiple_matching.go new file mode 100644 index 000000000..133554471 --- /dev/null +++ b/pkg/integration/tests/sync/force_push_multiple_matching.go @@ -0,0 +1,53 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ForcePushMultipleMatching = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Force push to multiple branches because the user has push.default matching", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.SetConfig("push.default", "matching") + + createTwoBranchesReadyToForcePush(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓1 repo → master")) + + t.Views().Branches(). + Lines( + Contains("master ↓1"), + Contains("other_branch ↓1"), + ) + + t.Views().Files().IsFocused().Press(keys.Universal.Push) + + t.ExpectPopup().Confirmation(). + Title(Equals("Force push")). + Content(Equals("Your branch has diverged from the remote branch. Press 'esc' to cancel, or 'enter' to force push.")). + Confirm() + + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Status().Content(Contains("✓ repo → master")) + + t.Views().Branches(). + Lines( + Contains("master ✓"), + Contains("other_branch ✓"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/force_push_multiple_upstream.go b/pkg/integration/tests/sync/force_push_multiple_upstream.go new file mode 100644 index 000000000..d8833c12f --- /dev/null +++ b/pkg/integration/tests/sync/force_push_multiple_upstream.go @@ -0,0 +1,71 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +func createTwoBranchesReadyToForcePush(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + + shell.NewBranch("other_branch") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + shell.SetBranchUpstream("other_branch", "origin/other_branch") + + // remove the 'two' commit so that we have something to pull from the remote + shell.HardReset("HEAD^") + + shell.Checkout("master") + // doing the same for master + shell.HardReset("HEAD^") +} + +var ForcePushMultipleUpstream = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Force push to only the upstream branch of the current branch because the user has push.default upstream", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.SetConfig("push.default", "upstream") + + createTwoBranchesReadyToForcePush(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓1 repo → master")) + + t.Views().Branches(). + Lines( + Contains("master ↓1"), + Contains("other_branch ↓1"), + ) + + t.Views().Files().IsFocused().Press(keys.Universal.Push) + + t.ExpectPopup().Confirmation(). + Title(Equals("Force push")). + Content(Equals("Your branch has diverged from the remote branch. Press 'esc' to cancel, or 'enter' to force push.")). + Confirm() + + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Status().Content(Contains("✓ repo → master")) + + t.Views().Branches(). + Lines( + Contains("master ✓"), + Contains("other_branch ↓1"), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index ef6ed229b..dedd93e6c 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -73,6 +73,8 @@ var tests = []*components.IntegrationTest{ submodule.Reset, sync.FetchPrune, sync.ForcePush, + sync.ForcePushMultipleMatching, + sync.ForcePushMultipleUpstream, sync.Pull, sync.PullAndSetUpstream, sync.RenameBranchAndPull, diff --git a/test/integration/forcePushMultipleMatching/expected/origin/HEAD b/test/integration/forcePushMultipleMatching/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/forcePushMultipleMatching/expected/origin/config b/test/integration/forcePushMultipleMatching/expected/origin/config deleted file mode 100644 index 41711784a..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePushMultiple/actual/./repo diff --git a/test/integration/forcePushMultipleMatching/expected/origin/description b/test/integration/forcePushMultipleMatching/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/forcePushMultipleMatching/expected/origin/info/exclude b/test/integration/forcePushMultipleMatching/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/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/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe b/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe deleted file mode 100644 index c58bcbe9b..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJ&N\y1P!ER#tyS5[ mSs?hDs XzLE=8w`1N/>R' ShpEޝ4;;ʲ*2K, \ No newline at end of file diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleMatching/expected/origin/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/forcePushMultipleMatching/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleMatching/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad b/test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad deleted file mode 100644 index fcaa0a8780d24739d5ad11f70a44f6b751a3e800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fH0A1%4*$a~QX+9t#bk$>|$$MBZwv-5ZdwT>|1H&w)tgS8G zLgG{3MJ&z`s6-D{nMgB}YOX*UU5PURmf>I#v*lf0-HH!N%*vRx&LNc;@{pV&4ivyU zWT>%vF!|jd>u$%%UdQP!pWL>mT*}&R7CcAd#0d5b;G8+^G1cYI+_bMQPa*RI@IE?2 DVyi~F diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleMatching/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d3548aa14bca5d35e0871b31e326387c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleMatching/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleMatching/expected/origin/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/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 b/test/integration/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 deleted file mode 100644 index e1d86f23c77acd71d78937ead55b7b794285b9ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZCdo7b5uvLdW2Tv4!PrtF=4Sa&;4_Bu{?{czi!dYRXDvp^yFkOP7}12|`ndQ5fwlbiOf%Tv+(00iJV Eq{C-O9{>OV diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 b/test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 deleted file mode 100644 index 114e72ec5c45d8d5f3a8a642b646b236307422c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3d0}}K+&!}h5JHrbQ~2*DP)ynj5^XlZ9=fn-o80Px1YE8W$k?# z8WNtyE~1N=h%tb1=s0*wPB_?-eXfm(C?_eEDXNWkc?~TTnnP@8xz!v}iGh7G&06mQ zkg*6gRszNE@mO~~&H6gcclmJNo^mN`ziA+h4ij3?X8>c=QIDx1e{$8oZFvf+AGN1B E^6vXZ4*&oF diff --git a/test/integration/forcePushMultipleMatching/expected/origin/packed-refs b/test/integration/forcePushMultipleMatching/expected/origin/packed-refs deleted file mode 100644 index 970c0dc0b..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/packed-refs +++ /dev/null @@ -1,3 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -e67f344f42afdb79c87a590f22537160241d8d61 refs/heads/master -e67f344f42afdb79c87a590f22537160241d8d61 refs/heads/other_branch diff --git a/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master b/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master deleted file mode 100644 index 51eb490a4..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch b/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch deleted file mode 100644 index 51eb490a4..000000000 --- a/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 0a4e5da7e..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1,2 +0,0 @@ -bd739fb752ed02ccd49422196e31599c87ff90ad branch 'master' of ../origin -fe67c3eaf819025990d3688d5f147a064e669ca5 not-for-merge branch 'other_branch' of ../origin diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index e7aee65c4..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -fe67c3eaf819025990d3688d5f147a064e669ca5 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config deleted file mode 100644 index 2be68507e..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config +++ /dev/null @@ -1,21 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[push] - default = matching -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[branch "other_branch"] - remote = origin - merge = refs/heads/other_branch diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/description b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/forcePushMultipleMatching/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/forcePushMultipleMatching/expected/repo/.git_keep/index b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/index deleted file mode 100644 index 5c83b42dcdec4a11995f594f24a2642f6a783553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_B>M|*b!IP`45Jwt7+9I+xfnArG%jIaVEhVHBLc*1OZPnftD1V_ zOGIcCPrlQI0I!zrs|@V9m1&tdsfIuWApN=(`@g_ws5xHf=1B1TFltcRckbn?Md4Nb zEw8laTd2d#F#?(s66ER%q$C-P6b!hQn@B}|xclyB=Ck?R%$m|JY4fXyDb>H&;-*~t SdW!pwS2n-fS#x%kRsaA`97+%X diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/info/exclude b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/forcePushMultipleMatching/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/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index fa818156f..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 7a35f0bb6bd8dc18ae462465e51f02362ba6babe CI 1648349421 +1100 commit (initial): myfile1 -7a35f0bb6bd8dc18ae462465e51f02362ba6babe e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 commit: myfile2 -e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 checkout: moving from master to other_branch -e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 checkout: moving from other_branch to master -e67f344f42afdb79c87a590f22537160241d8d61 bd739fb752ed02ccd49422196e31599c87ff90ad CI 1648349421 +1100 commit: myfile3 -bd739fb752ed02ccd49422196e31599c87ff90ad e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 reset: moving to HEAD^ -e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 checkout: moving from master to other_branch -e67f344f42afdb79c87a590f22537160241d8d61 fe67c3eaf819025990d3688d5f147a064e669ca5 CI 1648349421 +1100 commit: myfile4 -fe67c3eaf819025990d3688d5f147a064e669ca5 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349422 +1100 reset: moving to HEAD^ -e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349422 +1100 checkout: moving from other_branch to master diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 7c4a7732c..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 7a35f0bb6bd8dc18ae462465e51f02362ba6babe CI 1648349421 +1100 commit (initial): myfile1 -7a35f0bb6bd8dc18ae462465e51f02362ba6babe e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 commit: myfile2 -e67f344f42afdb79c87a590f22537160241d8d61 bd739fb752ed02ccd49422196e31599c87ff90ad CI 1648349421 +1100 commit: myfile3 -bd739fb752ed02ccd49422196e31599c87ff90ad e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index 76c0be40c..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 branch: Created from HEAD -e67f344f42afdb79c87a590f22537160241d8d61 fe67c3eaf819025990d3688d5f147a064e669ca5 CI 1648349421 +1100 commit: myfile4 -fe67c3eaf819025990d3688d5f147a064e669ca5 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349422 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index f6e6b60bd..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 fetch origin: storing head -e67f344f42afdb79c87a590f22537160241d8d61 bd739fb752ed02ccd49422196e31599c87ff90ad CI 1648349421 +1100 update by push -bd739fb752ed02ccd49422196e31599c87ff90ad e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349423 +1100 update by push diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch deleted file mode 100644 index 5672ee50e..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 fetch origin: storing head -e67f344f42afdb79c87a590f22537160241d8d61 fe67c3eaf819025990d3688d5f147a064e669ca5 CI 1648349421 +1100 update by push -fe67c3eaf819025990d3688d5f147a064e669ca5 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349423 +1100 update by push diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe deleted file mode 100644 index c58bcbe9b..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJ&N\y1P!ER#tyS5[ mSs?hDs XzLE=8w`1N/>R' ShpEޝ4;;ʲ*2K, \ No newline at end of file diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleMatching/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/forcePushMultipleMatching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad deleted file mode 100644 index fcaa0a8780d24739d5ad11f70a44f6b751a3e800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAJ3c@fH0A1%4*$a~QX+9t#bk$>|$$MBZwv-5ZdwT>|1H&w)tgS8G zLgG{3MJ&z`s6-D{nMgB}YOX*UU5PURmf>I#v*lf0-HH!N%*vRx&LNc;@{pV&4ivyU zWT>%vF!|jd>u$%%UdQP!pWL>mT*}&R7CcAd#0d5b;G8+^G1cYI+_bMQPa*RI@IE?2 DVyi~F diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d3548aa14bca5d35e0871b31e326387c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleMatching/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/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 deleted file mode 100644 index e1d86f23c77acd71d78937ead55b7b794285b9ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZCdo7b5uvLdW2Tv4!PrtF=4Sa&;4_Bu{?{czi!dYRXDvp^yFkOP7}12|`ndQ5fwlbiOf%Tv+(00iJV Eq{C-O9{>OV diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 deleted file mode 100644 index 114e72ec5c45d8d5f3a8a642b646b236307422c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3d0}}K+&!}h5JHrbQ~2*DP)ynj5^XlZ9=fn-o80Px1YE8W$k?# z8WNtyE~1N=h%tb1=s0*wPB_?-eXfm(C?_eEDXNWkc?~TTnnP@8xz!v}iGh7G&06mQ zkg*6gRszNE@mO~~&H6gcclmJNo^mN`ziA+h4ij3?X8>c=QIDx1e{$8oZFvf+AGN1B E^6vXZ4*&oF diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 51eb490a4..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index 51eb490a4..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 51eb490a4..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch deleted file mode 100644 index 51eb490a4..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch +++ /dev/null @@ -1 +0,0 @@ -e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/myfile1 b/test/integration/forcePushMultipleMatching/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/myfile2 b/test/integration/forcePushMultipleMatching/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/forcePushMultipleMatching/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/forcePushMultipleMatching/recording.json b/test/integration/forcePushMultipleMatching/recording.json deleted file mode 100644 index ae367f16d..000000000 --- a/test/integration/forcePushMultipleMatching/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":892,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1379,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2132,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":135,"Height":36}]} \ No newline at end of file diff --git a/test/integration/forcePushMultipleMatching/setup.sh b/test/integration/forcePushMultipleMatching/setup.sh deleted file mode 100644 index 185ea46e9..000000000 --- a/test/integration/forcePushMultipleMatching/setup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" -git config push.default matching - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -git checkout -b other_branch -git checkout master - -cd .. -git clone --bare ./repo origin - -cd repo - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master -git branch --set-upstream-to=origin/other_branch other_branch - -echo test3 > myfile3 -git add . -git commit -am "myfile3" - -git push origin master -git reset --hard HEAD^ - -git checkout other_branch - -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git push origin other_branch -git reset --hard HEAD^ - -git checkout master - -# at this point, both branches have diverged from their remote counterparts, meaning if you -# attempt to push either, it'll ask if you want to force push. diff --git a/test/integration/forcePushMultipleMatching/test.json b/test/integration/forcePushMultipleMatching/test.json deleted file mode 100644 index e62caa40f..000000000 --- a/test/integration/forcePushMultipleMatching/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Force push to multiple branches because the user has push.default matching", - "speed": 10 -} diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/HEAD b/test/integration/forcePushMultipleUpstream/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/config b/test/integration/forcePushMultipleUpstream/expected/origin/config deleted file mode 100644 index 6504f87b4..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePushMultipleUpstream/actual/./repo diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/description b/test/integration/forcePushMultipleUpstream/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/info/exclude b/test/integration/forcePushMultipleUpstream/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/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/forcePushMultipleUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 deleted file mode 100644 index c1564b80fe29af50d9b0c2337fd1383aee76549d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeJobZkq&(2tD-~>2?X z7!vku^1D9w(~grJ#_1uST#ij{yqCL$o+47}$lEJ`bEergRprmzl&`Lvp!os3pgHL6 Cnn^7H diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936c b/test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936c deleted file mode 100644 index 52bacd10573bc907dbf03369ffb3d858a9a362cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcX03c@fDKw;N8MfQTsB-3dIM1-z-jQmWnU~DN7^!D}$ZXe&`<+Zh? zTNFC=UDd|X6UIR*l%iUNMOkWM&%rSl=Mq#$$YzVXzPb&VN=9S|J{L;F!{EKIq)Dh` z@D5N$2+qWJf2_NmW_z9HyMAKZo_fh^yIEuko@5|r&xio#sK->-Ke=h&x;)jHA91KT EV2qwhr2qf` diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 deleted file mode 100644 index b9233622d..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@ѮsJ&cR -<ƘL#tyS5[ S0jDs XZLER۫0p~Mo)v4;9i'w-~3, \ No newline at end of file diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleUpstream/expected/origin/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/forcePushMultipleUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 deleted file mode 100644 index 3054cb14b..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 +++ /dev/null @@ -1,5 +0,0 @@ -xM -0@s %R -<8N`H -}|'[KU+ 9v>r2u\80eC2;j2QAIRt `=7B; -99On, 9 \ No newline at end of file diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d3548aa14bca5d35e0871b31e326387c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleUpstream/expected/origin/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/forcePushMultipleUpstream/expected/origin/packed-refs b/test/integration/forcePushMultipleUpstream/expected/origin/packed-refs deleted file mode 100644 index 06b105db2..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/packed-refs +++ /dev/null @@ -1,3 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -49ea44f3ec1792142714930c8e4c3073f137936c refs/heads/master -49ea44f3ec1792142714930c8e4c3073f137936c refs/heads/other_branch diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master b/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master deleted file mode 100644 index f29b96944..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch b/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch deleted file mode 100644 index 7c9ad8321..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -c84375dda9d81c1f2103defe4384e31f859dac86 diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e799afa43..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1,2 +0,0 @@ -486301f318c84045827013a3c3246b8c6a319eb8 branch 'master' of ../origin -c84375dda9d81c1f2103defe4384e31f859dac86 not-for-merge branch 'other_branch' of ../origin diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 7c9ad8321..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -c84375dda9d81c1f2103defe4384e31f859dac86 diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config deleted file mode 100644 index 3d6ea6c8d..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config +++ /dev/null @@ -1,21 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[push] - default = upstream -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[branch "other_branch"] - remote = origin - merge = refs/heads/other_branch diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/description b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/forcePushMultipleUpstream/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/forcePushMultipleUpstream/expected/repo/.git_keep/index b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/index deleted file mode 100644 index 9ec36686f295f0bfd322aeb21c9020e317ac7760..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_B>Ri0)}9<+VKgHH11r-!kE;v}jY}997{3D5hyXF$(mjv=s;1uf z5)m53lkapPz^kSEDg%3NWm;xVsv%GTP=6Z3rW3DWG}N3o=;lc9{4i=z+IQ~dszu>d z{VlJw=Ub@5%rOF*6B6X=3Zx_%j1&yGmYYaLez^PYXXdl{+svBME@|_ti23|f@Y)=| Tj#2f{$=R2=OMZz7I6MRZ3PVRz diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/info/exclude b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/forcePushMultipleUpstream/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/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index e6ba4297a..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 81bdc116083cd4b4655333f4eb94dc0320197082 CI 1648349542 +1100 commit (initial): myfile1 -81bdc116083cd4b4655333f4eb94dc0320197082 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 commit: myfile2 -49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from master to other_branch -49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from other_branch to master -49ea44f3ec1792142714930c8e4c3073f137936c 486301f318c84045827013a3c3246b8c6a319eb8 CI 1648349542 +1100 commit: myfile3 -486301f318c84045827013a3c3246b8c6a319eb8 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ -49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from master to other_branch -49ea44f3ec1792142714930c8e4c3073f137936c c84375dda9d81c1f2103defe4384e31f859dac86 CI 1648349542 +1100 commit: myfile4 -c84375dda9d81c1f2103defe4384e31f859dac86 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ -49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from other_branch to master diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 4e2739b8e..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 81bdc116083cd4b4655333f4eb94dc0320197082 CI 1648349542 +1100 commit (initial): myfile1 -81bdc116083cd4b4655333f4eb94dc0320197082 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 commit: myfile2 -49ea44f3ec1792142714930c8e4c3073f137936c 486301f318c84045827013a3c3246b8c6a319eb8 CI 1648349542 +1100 commit: myfile3 -486301f318c84045827013a3c3246b8c6a319eb8 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index efd57e6fd..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 branch: Created from HEAD -49ea44f3ec1792142714930c8e4c3073f137936c c84375dda9d81c1f2103defe4384e31f859dac86 CI 1648349542 +1100 commit: myfile4 -c84375dda9d81c1f2103defe4384e31f859dac86 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index c08c7c66b..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 fetch origin: storing head -49ea44f3ec1792142714930c8e4c3073f137936c 486301f318c84045827013a3c3246b8c6a319eb8 CI 1648349542 +1100 update by push -486301f318c84045827013a3c3246b8c6a319eb8 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349543 +1100 update by push diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch deleted file mode 100644 index fd6564f9b..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 fetch origin: storing head -49ea44f3ec1792142714930c8e4c3073f137936c c84375dda9d81c1f2103defe4384e31f859dac86 CI 1648349542 +1100 update by push diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 deleted file mode 100644 index c1564b80fe29af50d9b0c2337fd1383aee76549d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeJobZkq&(2tD-~>2?X z7!vku^1D9w(~grJ#_1uST#ij{yqCL$o+47}$lEJ`bEergRprmzl&`Lvp!os3pgHL6 Cnn^7H diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936c b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936c deleted file mode 100644 index 52bacd10573bc907dbf03369ffb3d858a9a362cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcX03c@fDKw;N8MfQTsB-3dIM1-z-jQmWnU~DN7^!D}$ZXe&`<+Zh? zTNFC=UDd|X6UIR*l%iUNMOkWM&%rSl=Mq#$$YzVXzPb&VN=9S|J{L;F!{EKIq)Dh` z@D5N$2+qWJf2_NmW_z9HyMAKZo_fh^yIEuko@5|r&xio#sK->-Ke=h&x;)jHA91KT EV2qwhr2qf` diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 deleted file mode 100644 index b9233622d..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@ѮsJ&cR -<ƘL#tyS5[ S0jDs XZLER۫0p~Mo)v4;9i'w-~3, \ No newline at end of file diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleUpstream/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/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 deleted file mode 100644 index 3054cb14b..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 +++ /dev/null @@ -1,5 +0,0 @@ -xM -0@s %R -<8N`H -}|'[KU+ 9v>r2u\80eC2;j2QAIRt `=7B; -99On, 9 \ No newline at end of file diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d3548aa14bca5d35e0871b31e326387c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleUpstream/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/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index f29b96944..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index f29b96944..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index f29b96944..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch deleted file mode 100644 index 7c9ad8321..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch +++ /dev/null @@ -1 +0,0 @@ -c84375dda9d81c1f2103defe4384e31f859dac86 diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/myfile1 b/test/integration/forcePushMultipleUpstream/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/myfile2 b/test/integration/forcePushMultipleUpstream/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/forcePushMultipleUpstream/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/forcePushMultipleUpstream/recording.json b/test/integration/forcePushMultipleUpstream/recording.json deleted file mode 100644 index ae367f16d..000000000 --- a/test/integration/forcePushMultipleUpstream/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":892,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1379,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2132,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":135,"Height":36}]} \ No newline at end of file diff --git a/test/integration/forcePushMultipleUpstream/setup.sh b/test/integration/forcePushMultipleUpstream/setup.sh deleted file mode 100644 index f31f24041..000000000 --- a/test/integration/forcePushMultipleUpstream/setup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" -git config push.default upstream - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -git checkout -b other_branch -git checkout master - -cd .. -git clone --bare ./repo origin - -cd repo - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master -git branch --set-upstream-to=origin/other_branch other_branch - -echo test3 > myfile3 -git add . -git commit -am "myfile3" - -git push origin master -git reset --hard HEAD^ - -git checkout other_branch - -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git push origin other_branch -git reset --hard HEAD^ - -git checkout master - -# at this point, both branches have diverged from their remote counterparts, meaning if you -# attempt to push either, it'll ask if you want to force push. diff --git a/test/integration/forcePushMultipleUpstream/test.json b/test/integration/forcePushMultipleUpstream/test.json deleted file mode 100644 index 4569d3cc9..000000000 --- a/test/integration/forcePushMultipleUpstream/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Force push to only one branch because the user has push.default upstream", - "speed": 10 -} From 13ee0f0a5d2a0b480a67518cdb211e10be5a3254 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 13:54:15 +1100 Subject: [PATCH 05/11] migrate open to branches with cli arg test --- .../tests/branch/open_with_cli_arg.go | 18 ++++++++++++++++++ pkg/integration/tests/tests_gen.go | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../gitArg/expected/repo/.git_keep/FETCH_HEAD | 0 .../gitArg/expected/repo/.git_keep/HEAD | 1 - .../gitArg/expected/repo/.git_keep/config | 10 ---------- .../expected/repo/.git_keep/description | 1 - .../gitArg/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 ------- .../gitArg/expected/repo/.git_keep/logs/HEAD | 3 --- .../repo/.git_keep/logs/refs/heads/master | 1 - .../repo/.git_keep/logs/refs/heads/other | 1 - .../45/fe0608335366a31a1ad6dacbdcc6b17d31a5b6 | Bin 118 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/heads/other | 1 - test/integration/gitArg/recording.json | 1 - test/integration/gitArg/setup.sh | 14 -------------- test/integration/gitArg/test.json | 5 ----- 19 files changed, 19 insertions(+), 47 deletions(-) create mode 100644 pkg/integration/tests/branch/open_with_cli_arg.go delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/config delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/description delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/index delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/other delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/objects/45/fe0608335366a31a1ad6dacbdcc6b17d31a5b6 delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/gitArg/expected/repo/.git_keep/refs/heads/other delete mode 100644 test/integration/gitArg/recording.json delete mode 100644 test/integration/gitArg/setup.sh delete mode 100644 test/integration/gitArg/test.json diff --git a/pkg/integration/tests/branch/open_with_cli_arg.go b/pkg/integration/tests/branch/open_with_cli_arg.go new file mode 100644 index 000000000..45029d603 --- /dev/null +++ b/pkg/integration/tests/branch/open_with_cli_arg.go @@ -0,0 +1,18 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var OpenWithCliArg = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Open straight to branches panel using a CLI arg", + ExtraCmdArgs: "branch", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches().IsFocused() + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index dedd93e6c..495fb16ed 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -27,6 +27,7 @@ var tests = []*components.IntegrationTest{ branch.CheckoutByName, branch.Delete, branch.DetachedHead, + branch.OpenWithCliArg, branch.Rebase, branch.RebaseAndDrop, branch.RebaseDoesNotAutosquash, diff --git a/test/integration/gitArg/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/gitArg/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 907b30816..000000000 --- a/test/integration/gitArg/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -blah diff --git a/test/integration/gitArg/expected/repo/.git_keep/FETCH_HEAD b/test/integration/gitArg/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/gitArg/expected/repo/.git_keep/HEAD b/test/integration/gitArg/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/gitArg/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/gitArg/expected/repo/.git_keep/config b/test/integration/gitArg/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/gitArg/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/gitArg/expected/repo/.git_keep/description b/test/integration/gitArg/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/gitArg/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/gitArg/expected/repo/.git_keep/index b/test/integration/gitArg/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1654768290 +1000 commit (initial): blah -45fe0608335366a31a1ad6dacbdcc6b17d31a5b6 45fe0608335366a31a1ad6dacbdcc6b17d31a5b6 CI 1654768290 +1000 checkout: moving from master to other -45fe0608335366a31a1ad6dacbdcc6b17d31a5b6 45fe0608335366a31a1ad6dacbdcc6b17d31a5b6 CI 1654768291 +1000 checkout: moving from other to master diff --git a/test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 12b2c7ee4..000000000 --- a/test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 45fe0608335366a31a1ad6dacbdcc6b17d31a5b6 CI 1654768290 +1000 commit (initial): blah diff --git a/test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/other b/test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/other deleted file mode 100644 index d1b9aa145..000000000 --- a/test/integration/gitArg/expected/repo/.git_keep/logs/refs/heads/other +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 45fe0608335366a31a1ad6dacbdcc6b17d31a5b6 CI 1654768290 +1000 branch: Created from HEAD diff --git a/test/integration/gitArg/expected/repo/.git_keep/objects/45/fe0608335366a31a1ad6dacbdcc6b17d31a5b6 b/test/integration/gitArg/expected/repo/.git_keep/objects/45/fe0608335366a31a1ad6dacbdcc6b17d31a5b6 deleted file mode 100644 index 3171fbc5aa45b9978e09873788bb3ce33dc82d45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDKvCB@#q0%{#K|}T5uvLdBa=?4&=4sRdi?eXZa)uxX|;Yj zc)DNuW(K4Z;#8PIQ8rB(87-2|GI0tbvzk#ta{1Snw!tvMa~R*Y=lWgkR$6_5=SUBh YkPxmO5#3qONw+__(={*d0IxPHz}+Y{8UO$Q diff --git a/test/integration/gitArg/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/gitArg/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb Date: Sun, 19 Feb 2023 13:55:20 +1100 Subject: [PATCH 06/11] remove already migrated test --- .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../gitignoreMenu/expected/repo/.git_keep/HEAD | 1 - .../gitignoreMenu/expected/repo/.git_keep/config | 8 -------- .../expected/repo/.git_keep/description | 1 - .../gitignoreMenu/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 ------ .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../04/535177acab8a81c84b0b1b44ee3aea76b0e36e | Bin 122 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../gitignoreMenu/expected/repo/lg_ignore_file | 1 - .../gitignoreMenu/expected/repo/myfile1 | 1 - test/integration/gitignoreMenu/recording.json | 1 - test/integration/gitignoreMenu/setup.sh | 14 -------------- test/integration/gitignoreMenu/test.json | 4 ---- 17 files changed, 41 deletions(-) delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/config delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/description delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/index delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/objects/04/535177acab8a81c84b0b1b44ee3aea76b0e36e delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/gitignoreMenu/expected/repo/lg_ignore_file delete mode 100644 test/integration/gitignoreMenu/expected/repo/myfile1 delete mode 100644 test/integration/gitignoreMenu/recording.json delete mode 100644 test/integration/gitignoreMenu/setup.sh delete mode 100644 test/integration/gitignoreMenu/test.json diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/gitignoreMenu/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 5852f4463..000000000 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/FETCH_HEAD b/test/integration/gitignoreMenu/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/HEAD b/test/integration/gitignoreMenu/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/config b/test/integration/gitignoreMenu/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/description b/test/integration/gitignoreMenu/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/gitignoreMenu/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/gitignoreMenu/expected/repo/.git_keep/index b/test/integration/gitignoreMenu/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1659528492 +0200 commit (initial): Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 329f08e98..000000000 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 04535177acab8a81c84b0b1b44ee3aea76b0e36e CI 1659528492 +0200 commit (initial): Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/04/535177acab8a81c84b0b1b44ee3aea76b0e36e b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/04/535177acab8a81c84b0b1b44ee3aea76b0e36e deleted file mode 100644 index ff7e7bc39b6258e7988a32c71a097211d3b0c681..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0ga783d0}}0DJZodoPsDb`=*&3FPE6)NH5_YX}zd{091gUWXYbw^~bw z!QL-@R|QU myfile1 diff --git a/test/integration/gitignoreMenu/test.json b/test/integration/gitignoreMenu/test.json deleted file mode 100644 index de26df98c..000000000 --- a/test/integration/gitignoreMenu/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "In this test a file is added to .gitingnore using the ignore or exclude menu", - "speed": 5 -} \ No newline at end of file From 88c76868ba8877bf3a22dcb0c11c12e780e7273d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 13:59:19 +1100 Subject: [PATCH 07/11] migrate initial open test --- pkg/integration/tests/misc/initial_open.go | 24 ++++++++++++++++++ pkg/integration/tests/tests_gen.go | 1 + .../integration/initialOpen/config/config.yml | 0 .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../initialOpen/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 -------- .../expected/repo/.git_keep/description | 1 - .../initialOpen/expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 ----- .../expected/repo/.git_keep/logs/HEAD | 2 -- .../repo/.git_keep/logs/refs/heads/master | 2 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../46/f86259c48ec60496e43d9c962e32f40e7cdefb | Bin 121 -> 0 bytes .../62/b35f5751dd871e0908247223d276b5efeb4cb4 | Bin 57 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../e4/776798a2a73374b45e6321b60b5578b9fb590c | 2 -- .../expected/repo/.git_keep/refs/heads/master | 1 - .../initialOpen/expected/repo/myfile1 | 1 - .../initialOpen/expected/repo/myfile2 | 1 - test/integration/initialOpen/recording.json | 1 - test/integration/initialOpen/setup.sh | 16 ------------ test/integration/initialOpen/test.json | 1 - 23 files changed, 25 insertions(+), 47 deletions(-) create mode 100644 pkg/integration/tests/misc/initial_open.go delete mode 100644 test/integration/initialOpen/config/config.yml delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/config delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/description delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/index delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/objects/46/f86259c48ec60496e43d9c962e32f40e7cdefb delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/objects/62/b35f5751dd871e0908247223d276b5efeb4cb4 delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c delete mode 100644 test/integration/initialOpen/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/initialOpen/expected/repo/myfile1 delete mode 100644 test/integration/initialOpen/expected/repo/myfile2 delete mode 100644 test/integration/initialOpen/recording.json delete mode 100644 test/integration/initialOpen/setup.sh delete mode 100644 test/integration/initialOpen/test.json diff --git a/pkg/integration/tests/misc/initial_open.go b/pkg/integration/tests/misc/initial_open.go new file mode 100644 index 000000000..cc4146fc6 --- /dev/null +++ b/pkg/integration/tests/misc/initial_open.go @@ -0,0 +1,24 @@ +package misc + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var InitialOpen = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Confirms a popup appears on first opening Lazygit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.DisableStartupPopups = false + }, + SetupRepo: func(shell *Shell) {}, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.ExpectPopup().Confirmation(). + Title(Equals("")). + Content(Contains("Thanks for using lazygit!")). + Confirm() + + t.Views().Files().IsFocused() + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 495fb16ed..ecd0ced70 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -64,6 +64,7 @@ var tests = []*components.IntegrationTest{ interactive_rebase.AmendMerge, interactive_rebase.One, misc.ConfirmOnQuit, + misc.InitialOpen, patch_building.CopyPatchToClipboard, stash.Rename, stash.Stash, diff --git a/test/integration/initialOpen/config/config.yml b/test/integration/initialOpen/config/config.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/initialOpen/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/initialOpen/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/initialOpen/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/initialOpen/expected/repo/.git_keep/FETCH_HEAD b/test/integration/initialOpen/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/initialOpen/expected/repo/.git_keep/HEAD b/test/integration/initialOpen/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/initialOpen/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/initialOpen/expected/repo/.git_keep/config b/test/integration/initialOpen/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/initialOpen/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/initialOpen/expected/repo/.git_keep/description b/test/integration/initialOpen/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/initialOpen/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/initialOpen/expected/repo/.git_keep/index b/test/integration/initialOpen/expected/repo/.git_keep/index deleted file mode 100644 index 825adac84ff3ddb3a0c9f49002a7219cc6669bb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_gxnPyO_grv!DvPX1{OBMb-4@-jY}997{3D5hyXF$(mjv=s;1uf z5)m53lkapPz^kSEDg%3NWm;xVsv%GTNWWQQIya1ln$tpxIYvNpLV{dffs`bJk%9qN u(&qT^z`N~ooE$1e%9qNvzJKkrCAY4BkpaijHA{uhzHqM&IaVKYb|nCig+`(P diff --git a/test/integration/initialOpen/expected/repo/.git_keep/info/exclude b/test/integration/initialOpen/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/initialOpen/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/initialOpen/expected/repo/.git_keep/logs/HEAD b/test/integration/initialOpen/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 9728b11df..000000000 --- a/test/integration/initialOpen/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 46f86259c48ec60496e43d9c962e32f40e7cdefb CI 1617799345 +1000 commit (initial): myfile1 -46f86259c48ec60496e43d9c962e32f40e7cdefb e4776798a2a73374b45e6321b60b5578b9fb590c CI 1617799348 +1000 commit: asd diff --git a/test/integration/initialOpen/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/initialOpen/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 9728b11df..000000000 --- a/test/integration/initialOpen/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 46f86259c48ec60496e43d9c962e32f40e7cdefb CI 1617799345 +1000 commit (initial): myfile1 -46f86259c48ec60496e43d9c962e32f40e7cdefb e4776798a2a73374b45e6321b60b5578b9fb590c CI 1617799348 +1000 commit: asd diff --git a/test/integration/initialOpen/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/initialOpen/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmbmnW01vqb%|NYNpjQ$%9a=IlW-1k=uG&ucRgU5;W^DOJww?yeZ*QuAR%kL b?|FbbA)>kJHEH@MH|3kxP09QKHAXDoL8&<= diff --git a/test/integration/initialOpen/expected/repo/.git_keep/objects/62/b35f5751dd871e0908247223d276b5efeb4cb4 b/test/integration/initialOpen/expected/repo/.git_keep/objects/62/b35f5751dd871e0908247223d276b5efeb4cb4 deleted file mode 100644 index dff6f06c885a035defe52f5b03d8baff6d79f937..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57 zcmV-90LK4#0V^p=O;s>AU@$Z=Ff%bx$gNDv%t`~^A08nuUMF0Q* diff --git a/test/integration/initialOpen/expected/repo/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c b/test/integration/initialOpen/expected/repo/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c deleted file mode 100644 index 013f3deb3..000000000 --- a/test/integration/initialOpen/expected/repo/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c +++ /dev/null @@ -1,2 +0,0 @@ -xM -1 @a=Ei6 "c'Eqw-^]18M2zSHH7\v-T 5o' VVM0N6ϸ/M|S]ub>5Onq8 \ No newline at end of file diff --git a/test/integration/initialOpen/expected/repo/.git_keep/refs/heads/master b/test/integration/initialOpen/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 89a4ee75f..000000000 --- a/test/integration/initialOpen/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -e4776798a2a73374b45e6321b60b5578b9fb590c diff --git a/test/integration/initialOpen/expected/repo/myfile1 b/test/integration/initialOpen/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/initialOpen/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/initialOpen/expected/repo/myfile2 b/test/integration/initialOpen/expected/repo/myfile2 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/initialOpen/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/initialOpen/recording.json b/test/integration/initialOpen/recording.json deleted file mode 100644 index 2fdf83dc0..000000000 --- a/test/integration/initialOpen/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":891,"Mod":0,"Key":27,"Ch":0},{"Timestamp":1344,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1639,"Mod":0,"Key":256,"Ch":99},{"Timestamp":2128,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2176,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2280,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2592,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2960,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/initialOpen/setup.sh b/test/integration/initialOpen/setup.sh deleted file mode 100644 index e7de1949f..000000000 --- a/test/integration/initialOpen/setup.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" - -echo test1 > myfile2 diff --git a/test/integration/initialOpen/test.json b/test/integration/initialOpen/test.json deleted file mode 100644 index f7fd28fab..000000000 --- a/test/integration/initialOpen/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "testing the initial popup appears when first starting lazygit", "speed": 15 } From b5e325b0a487f9ae6122d8410c393f60ea40251d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 14:47:07 +1100 Subject: [PATCH 08/11] migrate revert merge test --- pkg/integration/components/menu_driver.go | 12 +++++ pkg/integration/components/shell.go | 4 ++ pkg/integration/tests/commit/revert_merge.go | 43 ++++++++++++++++++ pkg/integration/tests/shared/conflicts.go | 8 ++++ pkg/integration/tests/tests_gen.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 423 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 --- .../expected/repo/.git_keep/logs/HEAD | 12 ----- .../repo/.git_keep/logs/refs/heads/another | 2 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../repo/.git_keep/logs/refs/heads/other | 8 ---- .../1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f | Bin 148 -> 0 bytes .../3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 | Bin 147 -> 0 bytes .../41/bed9f222cc54e68d7846dc010bea6d23bea33e | Bin 59 -> 0 bytes .../61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 | Bin 56 -> 0 bytes .../89/8618af3fef6edf472d0f4a483ed8010d7bcfbb | Bin 52 -> 0 bytes .../98/f656b294e5f3b447e3fd66814a80d0d4080627 | Bin 59 -> 0 bytes .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 | Bin 20 -> 0 bytes .../a4/942a576eec3a1a15fb790c942b6860331bee32 | 2 - .../a7/fd052c52f174943cdea637f2d11f5ab7d090cd | Bin 63 -> 0 bytes .../ba/4581dc53b5b2ff56803651dfd79245203d546b | Bin 196 -> 0 bytes .../be/5b46b808c9c808be26710daeb2ce9ed2c7a070 | Bin 67 -> 0 bytes .../c5/af43f6cc1d51ebb3ab4800347595541f81799c | Bin 63 -> 0 bytes .../d3/b35176a575d48743900b1f0863cefbc198f84c | Bin 118 -> 0 bytes .../dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c | 2 - .../e5/265503c8aea2860fc4754c1025e4597530ce0e | 1 - .../fa/0b6bf64815f57729716334319596c926b6564a | Bin 149 -> 0 bytes .../repo/.git_keep/refs/heads/another | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/heads/other | 1 - .../mergeConflictRevert/expected/repo/file1 | 1 - .../mergeConflictRevert/expected/repo/file2 | 1 - .../mergeConflictRevert/expected/repo/file4 | 1 - .../mergeConflictRevert/expected/repo/file5 | 1 - .../mergeConflictRevert/recording.json | 1 - test/integration/mergeConflictRevert/setup.sh | 40 ---------------- .../integration/mergeConflictRevert/test.json | 1 - 43 files changed, 68 insertions(+), 98 deletions(-) create mode 100644 pkg/integration/tests/commit/revert_merge.go delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/config delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/description delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/index delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file1 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file2 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file4 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file5 delete mode 100644 test/integration/mergeConflictRevert/recording.json delete mode 100644 test/integration/mergeConflictRevert/setup.sh delete mode 100644 test/integration/mergeConflictRevert/test.json diff --git a/pkg/integration/components/menu_driver.go b/pkg/integration/components/menu_driver.go index 00e1b1dc9..b8155aaf7 100644 --- a/pkg/integration/components/menu_driver.go +++ b/pkg/integration/components/menu_driver.go @@ -36,6 +36,18 @@ func (self *MenuDriver) Select(option *matcher) *MenuDriver { return self } +func (self *MenuDriver) Lines(matchers ...*matcher) *MenuDriver { + self.getViewDriver().Lines(matchers...) + + return self +} + +func (self *MenuDriver) TopLines(matchers ...*matcher) *MenuDriver { + self.getViewDriver().TopLines(matchers...) + + return self +} + func (self *MenuDriver) checkNecessaryChecksCompleted() { if !self.hasCheckedTitle { self.t.Fail("You must check the title of a menu popup by calling Title() before calling Confirm()/Cancel().") diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 9b7beca7c..ad4964507 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -116,6 +116,10 @@ func (self *Shell) Merge(name string) *Shell { return self.RunCommand("git merge --commit --no-ff " + name) } +func (self *Shell) ContinueMerge() *Shell { + return self.RunCommand("git -c core.editor=true merge --continue") +} + func (self *Shell) GitAdd(path string) *Shell { return self.RunCommand(fmt.Sprintf("git add \"%s\"", path)) } diff --git a/pkg/integration/tests/commit/revert_merge.go b/pkg/integration/tests/commit/revert_merge.go new file mode 100644 index 000000000..94b967916 --- /dev/null +++ b/pkg/integration/tests/commit/revert_merge.go @@ -0,0 +1,43 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var RevertMerge = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reverts a merge commit and chooses to revert to the parent commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeCommit(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits().Focus(). + TopLines( + Contains("Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + ). + Press(keys.Commits.RevertCommit) + + t.ExpectPopup().Menu(). + Title(Equals("Select parent commit for merge")). + Lines( + Contains("first change"), + Contains("second-change-branch unrelated change"), + Contains("cancel"), + ). + Select(Contains("first change")). + Confirm() + + t.Views().Commits().IsFocused(). + TopLines( + Contains("Revert \"Merge branch 'second-change-branch' into first-change-branch\""), + Contains("Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + ). + SelectPreviousItem() + + t.Views().Main().Content(Contains("-Second Change").Contains("+First Change")) + }, +}) diff --git a/pkg/integration/tests/shared/conflicts.go b/pkg/integration/tests/shared/conflicts.go index f01125c91..345636981 100644 --- a/pkg/integration/tests/shared/conflicts.go +++ b/pkg/integration/tests/shared/conflicts.go @@ -47,3 +47,11 @@ var MergeConflictsSetup = func(shell *Shell) { EmptyCommit("second-change-branch unrelated change"). Checkout("first-change-branch") } + +var CreateMergeCommit = func(shell *Shell) { + MergeConflictsSetup(shell) + + shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") + shell.UpdateFileAndAdd("file", SecondChangeFileContent) + shell.ContinueMerge() +} diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index ecd0ced70..70a85a1ee 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -40,6 +40,7 @@ var tests = []*components.IntegrationTest{ commit.DiscardOldFileChange, commit.NewBranch, commit.Revert, + commit.RevertMerge, commit.StageRangeOfLines, commit.Staged, commit.StagedWithoutHooks, diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD deleted file mode 100644 index 0ca960536..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index bf57b6527..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -e5265503c8aea2860fc4754c1025e4597530ce0e diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/config b/test/integration/mergeConflictRevert/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflictRevert/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/mergeConflictRevert/expected/repo/.git_keep/description b/test/integration/mergeConflictRevert/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflictRevert/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/mergeConflictRevert/expected/repo/.git_keep/index b/test/integration/mergeConflictRevert/expected/repo/.git_keep/index deleted file mode 100644 index 7b55ac98880f5fd297662fef5471a8de746822fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmZ?q402{*U|<4bmW17MXRJ=C-h|PN3=FIcMd5E47#f!_Ffe`vsu2NV*17A}?`-q= zVi3A+^1co0uN}YWvVRE!Yg%Sbsv%ICfdQ!hEW?2tH()fxoCtQ}%`t+T!)%qj0b~w{ zhMJ>Jyg4Rtb675J1-lDGL(Op`-W*e~IUzx=u0Vz)gNcFx*U|OP-_FPezTUjrgTbV9 zYKVMe<(webP*7mnfr7%A!O+0K%)|sn88BcAHf&;5+j8DZ#_%(gs%`K&XKu&3WG+V^ E0KVUtjQ{`u diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflictRevert/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/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d2c3533b1..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,12 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875852 +1000 commit (initial): test 1 -d3b35176a575d48743900b1f0863cefbc198f84c d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875853 +1000 checkout: moving from master to other -d3b35176a575d48743900b1f0863cefbc198f84c 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 commit: test 2 -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 checkout: moving from other to another -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f CI 1622875853 +1000 commit: test 3 -1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 checkout: moving from another to other -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 fa0b6bf64815f57729716334319596c926b6564a CI 1622875853 +1000 commit: test 4 -fa0b6bf64815f57729716334319596c926b6564a ba4581dc53b5b2ff56803651dfd79245203d546b CI 1622875853 +1000 merge another: Merge made by the 'recursive' strategy. -ba4581dc53b5b2ff56803651dfd79245203d546b a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875853 +1000 commit: test 5 -a4942a576eec3a1a15fb790c942b6860331bee32 e5265503c8aea2860fc4754c1025e4597530ce0e CI 1622875856 +1000 revert: Revert "Merge branch 'another' into other" -e5265503c8aea2860fc4754c1025e4597530ce0e a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875860 +1000 reset: moving to a4942a576eec3a1a15fb790c942b6860331bee32 -a4942a576eec3a1a15fb790c942b6860331bee32 ddad764e9e78b555cd41e5e81f8ce969cfa3972c CI 1622875862 +1000 commit: test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another deleted file mode 100644 index 0c750bad0..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 branch: Created from HEAD -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f CI 1622875853 +1000 commit: test 3 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 63a4baf99..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875852 +1000 commit (initial): test 1 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other deleted file mode 100644 index 3d3e05626..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other +++ /dev/null @@ -1,8 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875853 +1000 branch: Created from HEAD -d3b35176a575d48743900b1f0863cefbc198f84c 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 commit: test 2 -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 fa0b6bf64815f57729716334319596c926b6564a CI 1622875853 +1000 commit: test 4 -fa0b6bf64815f57729716334319596c926b6564a ba4581dc53b5b2ff56803651dfd79245203d546b CI 1622875853 +1000 merge another: Merge made by the 'recursive' strategy. -ba4581dc53b5b2ff56803651dfd79245203d546b a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875853 +1000 commit: test 5 -a4942a576eec3a1a15fb790c942b6860331bee32 e5265503c8aea2860fc4754c1025e4597530ce0e CI 1622875856 +1000 revert: Revert "Merge branch 'another' into other" -e5265503c8aea2860fc4754c1025e4597530ce0e a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875860 +1000 reset: moving to a4942a576eec3a1a15fb790c942b6860331bee32 -a4942a576eec3a1a15fb790c942b6860331bee32 ddad764e9e78b555cd41e5e81f8ce969cfa3972c CI 1622875862 +1000 commit: test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f deleted file mode 100644 index 9bc4b492bb429d8fc5069b26636771875e448199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAH3IZ_@06pgwxeJn{(^)`7@HEdzI^8H3XBZ>+eDefP1w|c-*4`gO z+YE=XGiz@vw=B*%BJ>5j^!7>1Kn1v86`v`SuB3XXY@vwD#yg zBOm%^27%bbTdXA*CM?2My;n-6g;~W*R@{wS^JcFOg=ZFuAxo6vQ}jF{&Qvi4R;#np zm}>Is@~7XI4Q>;hZ`0Mjxvft->C!GhVHi@BBn(GFM7Ps@s@tEr>-O$2xF3jVIew3Z BM)d#y diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e deleted file mode 100644 index 823da94ec4f602adc5ccf51118d6471e29b9acba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59 zcmV-B0L1@z0V^p=O;xb8WH2-^Ff%bxNXyJgHDs8(ZvDn88pu>RWdi!S?@ RASo~+q`(-f0sw2=F!|6V=y!@Ff%bxNXyJgHDs8(ZvDn88pu>RWdi!S?@ OASp1yssI2;kRf1a*%!_L diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb deleted file mode 100644 index 3f22e700010979c8aace27afa8c24396749b8482..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmV-40L%Y)0Rbrh*8g;JWn~~UGXOC#Fg7$aAZBT7WibGquCKXn88pu>RWdi!S?@ RASo~+q`(BL0sw3BF#6^M8p!|v diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 deleted file mode 100644 index 4667dcf6f2b51dda01be1dd1679b0195ab0e185a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 bcmb7HexU|FfcPQQAo?oNi}4cyKeo?HlHsBq3b5^+pzxH@ry3| Vmmn!HBBa2WkOC8|3IL?JK(P>48wLOX diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b deleted file mode 100644 index f2995f30069a126884c2a442585d2aca8a89e651..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmV;#06YJ90gaC_Y6CG408`&9wsR2(tCh4mK?nv{F7k+#w3{>d?u?Kj&(9G^pKchY znYyp*Z2N1pNyJw7Nw+y8Ecy!(sdhPf`yB5m|e7(66NIB z``}%UnQJC49688e?=&?IUa=JlT2vicCK0k3b8hkQiiS4Hb1Zv@%N5=)*Ry`h`nc;` y-PaFrOf;uBM-Q(K5vRi*6GQ)*PoLVq6iSz^E^v}7Gi5L|FfcPQQAo?oNi}4cyKeo?HlHsBq3b5^+pzxH@ry3| Zmmn!HBBa2WkOC7z3QVyo007f!P)v7<8%_WK diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c deleted file mode 100644 index a11ab4a6cf37664dba50381ad2b722f769e71aeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63 zcmV-F0Korv0V^p=O;s>7HexU|FfcPQQAo?oNi}4cyKeo?HlHsBq3b5^+pzxH@ry3| Vmmn!HBBa2CkOEVz3IL@BK(h~M8iD`- diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c deleted file mode 100644 index a2cdf6ec8f1e8831821b1955d9ca7035958dc113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gaAH3IZ_@06pgweHWyY$gL?@_R0sA46m;$IuNr%K!iX diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c deleted file mode 100644 index 2d746cac5..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c +++ /dev/null @@ -1,2 +0,0 @@ -xM -1 @a=E$mf5Hcuw-,?łZ!n(7Bs D(`˘Ja9RTHk9XU3el|/'Ybt.'#ugn8 \ No newline at end of file diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e deleted file mode 100644 index cde3bd747..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e +++ /dev/null @@ -1 +0,0 @@ -xPj0Y_CKkWR)^J`%bCmY-zy1e穃#Л]R̀Frv} ћMH7Y:O2) 9$]v6S$"*|U~x}ʩ 6HhjgQ])W-MU 7^G^>J;´8m h.c"EPG݀ӟq*#/W`A`ϯ3J>`6Cyg&*R&$' l' \ No newline at end of file diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a deleted file mode 100644 index a6bc9c709fe6b906e02461da49358ecfd5cff7bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gcW<3c@fDKvCB@MfQSBGMPyNB7&oOk3CSr3^CayjQA;lU(6x5kHxlj_!Fb7D$KAN>`@){N!QV!MchDd8v6=aA}B$eDy zW7bOA*p$z>FPpth_I#VJ@-2OR%Bd~=VjX**A|*n5bO2!Xx=#)Hlba#$VT1Vrd~Z3d D6D>iF diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another deleted file mode 100644 index 24e534ce9..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another +++ /dev/null @@ -1 +0,0 @@ -1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 249ffa1c2..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d3b35176a575d48743900b1f0863cefbc198f84c diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other deleted file mode 100644 index b22b268a7..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other +++ /dev/null @@ -1 +0,0 @@ -ddad764e9e78b555cd41e5e81f8ce969cfa3972c diff --git a/test/integration/mergeConflictRevert/expected/repo/file1 b/test/integration/mergeConflictRevert/expected/repo/file1 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file2 b/test/integration/mergeConflictRevert/expected/repo/file2 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file4 b/test/integration/mergeConflictRevert/expected/repo/file4 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file5 b/test/integration/mergeConflictRevert/expected/repo/file5 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/recording.json b/test/integration/mergeConflictRevert/recording.json deleted file mode 100644 index bbb4056aa..000000000 --- a/test/integration/mergeConflictRevert/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1730,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2002,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2305,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2968,"Mod":0,"Key":256,"Ch":116},{"Timestamp":3402,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3985,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4304,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5850,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6785,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7441,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7978,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8304,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8585,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8816,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8873,"Mod":0,"Key":256,"Ch":101},{"Timestamp":9041,"Mod":0,"Key":256,"Ch":115},{"Timestamp":9081,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9416,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11041,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":135,"Height":74}]} \ No newline at end of file diff --git a/test/integration/mergeConflictRevert/setup.sh b/test/integration/mergeConflictRevert/setup.sh deleted file mode 100644 index aa3eb68c7..000000000 --- a/test/integration/mergeConflictRevert/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - -git checkout -b master - -echo "test" > file1 -git add . -git commit -m "test 1" - -git checkout -b other - -echo "test" > file2 -git add . -git commit -m "test 2" - -git checkout -b another - -echo "test" > file3 -git add . -git commit -m "test 3" - -git checkout other - -echo "test" > file4 -git add . -git commit -m "test 4" - -git merge another - -echo "test" > file5 -git add . -git commit -m "test 5" - diff --git a/test/integration/mergeConflictRevert/test.json b/test/integration/mergeConflictRevert/test.json deleted file mode 100644 index d6ccd0d39..000000000 --- a/test/integration/mergeConflictRevert/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we revert a merge conflict, choosing which parent we want to retain... or something like that. We need to rename the newly created commit so that we don't fail on the snapshot comparison", "speed": 10 } From a51f64814ce9aab9405ad64e65645694cad5c8e3 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 14:49:19 +1100 Subject: [PATCH 09/11] show snapshot of lazygit when test fails for easier investigation --- go.mod | 2 +- go.sum | 4 +-- pkg/gui/gui_driver.go | 10 +++++++- vendor/github.com/jesseduffield/gocui/gui.go | 27 ++++++++++++++++++++ vendor/modules.txt | 2 +- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 13df3e490..39f3968ea 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/integrii/flaggy v1.4.0 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d - github.com/jesseduffield/gocui v0.3.1-0.20230217232659-7a98151b05c3 + github.com/jesseduffield/gocui v0.3.1-0.20230219034834-06a1f1e95da5 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e diff --git a/go.sum b/go.sum index 371f7b2a2..7b8d82222 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk= github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE= github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o= -github.com/jesseduffield/gocui v0.3.1-0.20230217232659-7a98151b05c3 h1:dNhaHQ5aK/j0zSUM7lqCxusQXVw84GyEpJ2xOm9LdUc= -github.com/jesseduffield/gocui v0.3.1-0.20230217232659-7a98151b05c3/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU= +github.com/jesseduffield/gocui v0.3.1-0.20230219034834-06a1f1e95da5 h1:6mrOZa9I1bol14HhVK0tl4w9xvvGKLWPmShPRey1Lxg= +github.com/jesseduffield/gocui v0.3.1-0.20230219034834-06a1f1e95da5/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU= github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0= github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo= github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY= diff --git a/pkg/gui/gui_driver.go b/pkg/gui/gui_driver.go index cf1e3bbb4..d9735c2fe 100644 --- a/pkg/gui/gui_driver.go +++ b/pkg/gui/gui_driver.go @@ -50,10 +50,18 @@ func (self *GuiDriver) CurrentContext() types.Context { } func (self *GuiDriver) Fail(message string) { + currentView := self.gui.g.CurrentView() + fullMessage := fmt.Sprintf( + "%s\nFinal Lazygit state:\n%s\nUpon failure, focused view was '%s'.\nLog:\n%s", message, + self.gui.g.Snapshot(), + currentView.Name(), + strings.Join(self.gui.CmdLog, "\n"), + ) + self.gui.g.Close() // need to give the gui time to close time.Sleep(time.Millisecond * 100) - panic(fmt.Sprintf("%s\nLog:\n%s", message, strings.Join(self.gui.CmdLog, "\n"))) + panic(fullMessage) } // logs to the normal place that you log to i.e. viewable with `lazygit --logs` diff --git a/vendor/github.com/jesseduffield/gocui/gui.go b/vendor/github.com/jesseduffield/gocui/gui.go index 3953c343b..f18e7fb38 100644 --- a/vendor/github.com/jesseduffield/gocui/gui.go +++ b/vendor/github.com/jesseduffield/gocui/gui.go @@ -1555,3 +1555,30 @@ func (g *Gui) matchView(v *View, kb *keybinding) bool { } return true } + +// returns a string representation of the current state of the gui, character-for-character +func (g *Gui) Snapshot() string { + if g.screen == nil { + return "" + } + + width, height := g.screen.Size() + + builder := &strings.Builder{} + + for y := 0; y < height; y++ { + for x := 0; x < width; x++ { + char, _, _, charWidth := g.screen.GetContent(x, y) + if charWidth == 0 { + continue + } + builder.WriteRune(char) + if charWidth > 1 { + x += charWidth - 1 + } + } + builder.WriteRune('\n') + } + + return builder.String() +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 4cc7f1c14..0f2fbc274 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -172,7 +172,7 @@ github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem github.com/jesseduffield/go-git/v5/utils/merkletrie/index github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame github.com/jesseduffield/go-git/v5/utils/merkletrie/noder -# github.com/jesseduffield/gocui v0.3.1-0.20230217232659-7a98151b05c3 +# github.com/jesseduffield/gocui v0.3.1-0.20230219034834-06a1f1e95da5 ## explicit; go 1.12 github.com/jesseduffield/gocui # github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 From 93b9e1bd1950033932f3b620ffdb06640298f22d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 15:01:57 +1100 Subject: [PATCH 10/11] migrate merge conflict undo test --- .../tests/conflicts/undo_choose_hunk.go | 34 ++++ pkg/integration/tests/shared/conflicts.go | 88 +++++++++- pkg/integration/tests/tests_gen.go | 2 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/MERGE_HEAD | 1 - .../expected/repo/.git_keep/MERGE_MODE | 0 .../expected/repo/.git_keep/MERGE_MSG | 9 - .../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 2118 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 33 ---- .../.git_keep/logs/refs/heads/base_branch | 3 - .../repo/.git_keep/logs/refs/heads/develop | 5 - .../logs/refs/heads/feature/cherry-picking | 9 - .../repo/.git_keep/logs/refs/heads/master | 5 - .../.git_keep/logs/refs/heads/other_branch | 2 - .../08/e2576bb7cd0dd9be54f9a523c4bedea0643557 | Bin 146 -> 0 bytes .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 112 -> 0 bytes .../17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 | Bin 34 -> 0 bytes .../17/4a8c9444cfa700682d74059d9fa9be5749242c | Bin 177 -> 0 bytes .../17/dc45dd142947e06cf7e635d62f2c0acbb86da7 | Bin 153 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../18/c07ac9568c564ececb199f78f64babc92214cb | Bin 159 -> 0 bytes .../18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 | Bin 66 -> 0 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 50 -> 0 bytes .../20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 | Bin 144 -> 0 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 117 -> 0 bytes .../22/b0fd807dd5e428c2d818aef6a2311d7c11e885 | Bin 66 -> 0 bytes .../24/10ee12b940bade9d9e99413732faa6dc60adb1 | Bin 34 -> 0 bytes .../24/6f7487e08e6330ccbec4053e701145d53f64d4 | Bin 327 -> 0 bytes .../27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 | Bin 145 -> 0 bytes .../27/9f068805e089660f7ddd17ff32f66100e0dca5 | 3 - .../2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 | Bin 150 -> 0 bytes .../31/f2a971f823279ba1ef877be7599da288f6e24b | Bin 121 -> 0 bytes .../32/d15fd4451b6693a93d6420c8af6cfc99348e71 | Bin 80 -> 0 bytes .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 120 -> 0 bytes .../36/e0ef3e52c6e29e64980c71defbab6064d2da8c | Bin 252 -> 0 bytes .../38/08a710b52a152bb73805fe274e0d877cf61800 | 2 - .../3d/1213374cd86b841f034768571d0b5f2c870a16 | Bin 161 -> 0 bytes .../44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 | 2 - .../4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 | 2 - .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 - .../5d/874a902548f753e50944827e572a7470aa9731 | Bin 107 -> 0 bytes .../5d/a4d9200457542d875fe4def54ac98c16332db0 | Bin 33 -> 0 bytes .../5d/c2e019349371e9b3e4f1be99754ba70094cad6 | 2 - .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 86 -> 0 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 54 -> 0 bytes .../61/01e935461d4cd862ae4a720846e87880d198b9 | Bin 66 -> 0 bytes .../68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 | Bin 155 -> 0 bytes .../6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 | 3 - .../78/3666de4acbb22a9efc205197667f5136118c54 | Bin 328 -> 0 bytes .../7b/c178be031c4645110e9accb4accf16902d2d7f | Bin 158 -> 0 bytes .../82/db6d0e4502f489719ea0f3dbe7e14413c6d28a | 3 - .../88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d | Bin 66 -> 0 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 65 -> 0 bytes .../8c/d762c119834784fdbf97e9bb3b4c15e804ebaa | Bin 147 -> 0 bytes .../90/a84fd62f8033027fab3e567a81d5ed2a6a71cd | Bin 66 -> 0 bytes .../91/65a12a95d3b2b9b8a0374de787af169b2c339e | Bin 48 -> 0 bytes .../95/9d7a10da71acf97b17300b40a3b4f30903e09c | Bin 358 -> 0 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 54 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../af/a76754c933269d7cd45630a7184a20849dbe9c | Bin 66 -> 0 bytes .../b4/121e2d6aa156227b6541431ddfb8594904b520 | Bin 66 -> 0 bytes .../c1/dd146476a4a37fff75b88612a718281ea83b58 | Bin 277 -> 0 bytes .../c2/7ef6b4964209a875191eca7e56605c8efa5eee | Bin 154 -> 0 bytes .../c5/0f7e1375a30118c2886d4b31318579f3419231 | Bin 154 -> 0 bytes .../c9/b473bec307b18fd94a913658f4d759be63ca47 | Bin 156 -> 0 bytes .../ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 | 2 - .../d0/60f7226715ca55b04e91fad2b8aca01badd993 | Bin 303 -> 0 bytes .../d2/5721fffa7dc911ff2a9102bef201db225e2f16 | Bin 166 -> 0 bytes .../d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 | Bin 201 -> 0 bytes .../da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 | Bin 227 -> 0 bytes .../db/f5ab9a4fa3f976d266f3be50670aa83121b420 | 3 - .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 - .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 50 -> 0 bytes .../e4/48ae5bf6371d80ebee24a22b6df341797a6511 | Bin 66 -> 0 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 86 -> 0 bytes .../ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d | Bin 361 -> 0 bytes .../eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 | Bin 66 -> 0 bytes .../f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 | Bin 144 -> 0 bytes .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 54 -> 0 bytes .../fd/31cea7e0b6e8d334280be34db8dd86cdda3007 | Bin 352 -> 0 bytes .../repo/.git_keep/refs/heads/base_branch | 1 - .../repo/.git_keep/refs/heads/develop | 1 - .../refs/heads/feature/cherry-picking | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/other_branch | 1 - .../expected/repo/cherrypicking1 | 1 - .../expected/repo/cherrypicking2 | 1 - .../expected/repo/cherrypicking3 | 1 - .../expected/repo/cherrypicking4 | 1 - .../expected/repo/cherrypicking5 | 1 - .../expected/repo/cherrypicking6 | 1 - .../expected/repo/cherrypicking7 | 1 - .../expected/repo/cherrypicking8 | 1 - .../expected/repo/cherrypicking9 | 1 - .../expected/repo/directory/file | 5 - .../expected/repo/directory/file2 | 5 - .../mergeConflictUndo/expected/repo/file | 1 - .../mergeConflictUndo/expected/repo/file1 | 63 ------- .../mergeConflictUndo/expected/repo/file3 | 5 - .../mergeConflictUndo/expected/repo/file4 | 5 - .../mergeConflictUndo/expected/repo/file5 | 5 - .../mergeConflictUndo/recording.json | 1 - test/integration/mergeConflictUndo/setup.sh | 158 ------------------ test/integration/mergeConflictUndo/test.json | 1 - 111 files changed, 123 insertions(+), 376 deletions(-) create mode 100644 pkg/integration/tests/conflicts/undo_choose_hunk.go delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/config delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/description delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/index delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/82/db6d0e4502f489719ea0f3dbe7e14413c6d28a delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/8c/d762c119834784fdbf97e9bb3b4c15e804ebaa delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking1 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking3 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking5 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking6 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking8 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking9 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/directory/file delete mode 100644 test/integration/mergeConflictUndo/expected/repo/directory/file2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file1 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file3 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file5 delete mode 100644 test/integration/mergeConflictUndo/recording.json delete mode 100644 test/integration/mergeConflictUndo/setup.sh delete mode 100644 test/integration/mergeConflictUndo/test.json diff --git a/pkg/integration/tests/conflicts/undo_choose_hunk.go b/pkg/integration/tests/conflicts/undo_choose_hunk.go new file mode 100644 index 000000000..0f2575304 --- /dev/null +++ b/pkg/integration/tests/conflicts/undo_choose_hunk.go @@ -0,0 +1,34 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var UndoChooseHunk = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Chooses a hunk when resolving a merge conflict and then undoes the choice", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeConflictFileMultiple(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + Content(Contains("<<<<<<< HEAD\nFirst Change")). + PressPrimaryAction(). + // choosing the first hunk + Content(DoesNotContain("<<<<<<< HEAD\nFirst Change")). + Press(keys.Universal.Undo). + Content(Contains("<<<<<<< HEAD\nFirst Change")) + }, +}) diff --git a/pkg/integration/tests/shared/conflicts.go b/pkg/integration/tests/shared/conflicts.go index 345636981..39a37cc37 100644 --- a/pkg/integration/tests/shared/conflicts.go +++ b/pkg/integration/tests/shared/conflicts.go @@ -48,10 +48,96 @@ var MergeConflictsSetup = func(shell *Shell) { Checkout("first-change-branch") } -var CreateMergeCommit = func(shell *Shell) { +var CreateMergeConflictFile = func(shell *Shell) { MergeConflictsSetup(shell) shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") +} + +var CreateMergeCommit = func(shell *Shell) { + CreateMergeConflictFile(shell) shell.UpdateFileAndAdd("file", SecondChangeFileContent) shell.ContinueMerge() } + +// These 'multiple' variants are just like the short ones but with longer file contents and with multiple conflicts within the file. + +var OriginalFileContentMultiple = ` +This +Is +The +Original +File +.. +It +Is +Longer +Than +The +Other +Options +` + +var FirstChangeFileContentMultiple = ` +This +Is +The +First Change +File +.. +It +Is +Longer +Than +The +Other +Other First Change +` + +var SecondChangeFileContentMultiple = ` +This +Is +The +Second Change +File +.. +It +Is +Longer +Than +The +Other +Other Second Change +` + +// prepares us for a rebase/merge that has conflicts +var MergeConflictsSetupMultiple = func(shell *Shell) { + shell. + NewBranch("original-branch"). + EmptyCommit("one"). + EmptyCommit("two"). + EmptyCommit("three"). + CreateFileAndAdd("file", OriginalFileContentMultiple). + Commit("original"). + NewBranch("first-change-branch"). + UpdateFileAndAdd("file", FirstChangeFileContentMultiple). + Commit("first change"). + Checkout("original-branch"). + NewBranch("second-change-branch"). + UpdateFileAndAdd("file", SecondChangeFileContentMultiple). + Commit("second change"). + EmptyCommit("second-change-branch unrelated change"). + Checkout("first-change-branch") +} + +var CreateMergeConflictFileMultiple = func(shell *Shell) { + MergeConflictsSetupMultiple(shell) + + shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") +} + +var CreateMergeCommitMultiple = func(shell *Shell) { + CreateMergeConflictFileMultiple(shell) + shell.UpdateFileAndAdd("file", SecondChangeFileContentMultiple) + shell.ContinueMerge() +} diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 70a85a1ee..c3637cbb9 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -9,6 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/cherry_pick" "github.com/jesseduffield/lazygit/pkg/integration/tests/commit" "github.com/jesseduffield/lazygit/pkg/integration/tests/config" + "github.com/jesseduffield/lazygit/pkg/integration/tests/conflicts" "github.com/jesseduffield/lazygit/pkg/integration/tests/custom_commands" "github.com/jesseduffield/lazygit/pkg/integration/tests/diff" "github.com/jesseduffield/lazygit/pkg/integration/tests/file" @@ -46,6 +47,7 @@ var tests = []*components.IntegrationTest{ commit.StagedWithoutHooks, commit.Unstaged, config.RemoteNamedStar, + conflicts.UndoChooseHunk, custom_commands.Basic, custom_commands.FormPrompts, custom_commands.MenuFromCommand, diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD deleted file mode 100644 index 904a2e296..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other_branch diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD deleted file mode 100644 index b4d7d5850..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD +++ /dev/null @@ -1 +0,0 @@ -82db6d0e4502f489719ea0f3dbe7e14413c6d28a diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG deleted file mode 100644 index 33462aeb1..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG +++ /dev/null @@ -1,9 +0,0 @@ -Merge branch 'develop' into other_branch - -# Conflicts: -# directory/file -# directory/file2 -# file1 -# file3 -# file4 -# file5 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index d324b15b4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -8cd762c119834784fdbf97e9bb3b4c15e804ebaa diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/config b/test/integration/mergeConflictUndo/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflictUndo/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/mergeConflictUndo/expected/repo/.git_keep/description b/test/integration/mergeConflictUndo/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflictUndo/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/mergeConflictUndo/expected/repo/.git_keep/index b/test/integration/mergeConflictUndo/expected/repo/.git_keep/index deleted file mode 100644 index 42f7d29fe1039a698e682836b6cca2aa4a95985b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2118 zcmZ?q402{*U|<4b@r3NHoNCqEIbbv+0|N`2E`K2dL*o(#2F9;IH6lQ4lF0bd)J@js zM$$U3A`Z6~6%7|>>}23e&PXjPsw~J%&d$tBHw3C<0Gm_yG73gR%_~ATuVXg<{imPS z+17q$%eOxGu<=)+PA{5yMsV{QU#o!41JY3QiqXw`J>kXmjphq)Oldf|N&kZ3%vp?@$GYfm=CTd1->EFp&i(9IS(Pe? zW}Z3Ryb03#z~%vIsCgCW=1o}Pe@(x^n5llXU07A))wfz%g=f*svw)j7>GNH%c|aO! zUM0GDN*n$*)Lwm}ap;D`x^IgNWoraqw4#}32{I2i0HtRHSi0x&U)9tbUm`-Ic=DYt z1bDS{Ulrg>$t+4uF3B&d)KAOINkyo}#zHmkem1Z6nX+eZ_)jSuQWx;@*VuJLT7d%d zBzS%pH7M;n_j1*u@T&fnSK9L})D0*w537IqQT+?faM-*G79+yH6qtwAzgWxzrV}>B zIXdTIG&H@0p`{mT6@hm`I~{i2n>%l&qq)(qWp@(RZe(CV#41ofpWqZ3e;5rlrxn#4 z#+=x8uL-Ii--DlWx-`{=Yn2qNnr_Iz3Ni;=+~Eu@h&c%9$LnHpTi9P1RL?$Msl2b^ zB%?!ro&wk$aIu6?h`~Y)cj;MAzuy05xNDUJm%;j*Gwhr1sGl+*!yMf10T*i+u0RM7 z>mJg~!R;P!v52r9gGH=+Am)Swxw-<45M|IcR50X%r+*OFfGfx~6j(7b3PPgS(7?dV z#DoEr>Nq^-j^@d!KOQc#IqUI!_qCfjJ9gZ;>=97C@K%3H<<6Taw-z&P`aO4!f5RJ| zYR-4BBY1fvr<9Z*&_2p%OKq*6zMi4Tep+9v%&M6?43KKzNTmw LiY`sb@QDBbJ2Xdq diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflictUndo/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/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 84a8cf021..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,33 +0,0 @@ -0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit -31f2a971f823279ba1ef877be7599da288f6e24b 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from master to feature/cherry-picking -31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year -3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh -d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh -dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool -687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice -17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha -c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah -5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo -c50f7e1375a30118c2886d4b31318579f3419231 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 checkout: moving from feature/cherry-picking to develop -c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop -18c07ac9568c564ececb199f78f64babc92214cb 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from develop to master -31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master -442a53c1b023b4816085fdc4eaa85d0c5fd897e2 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 checkout: moving from master to develop -18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop -7bc178be031c4645110e9accb4accf16902d2d7f 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 checkout: moving from develop to master -442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master -ced01df5f1a270490c1b9d4efe5ceb0c53626279 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 checkout: moving from master to develop -7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop -6dfbfa4bd19cb38608681df40ebb3a78bd13a824 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 checkout: moving from develop to master -ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master -c9b473bec307b18fd94a913658f4d759be63ca47 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 checkout: moving from master to develop -6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop -82db6d0e4502f489719ea0f3dbe7e14413c6d28a c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 checkout: moving from develop to master -c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master -279f068805e089660f7ddd17ff32f66100e0dca5 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 checkout: moving from master to base_branch -279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file -08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch -08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from other_branch to base_branch -08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed -4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch -08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch deleted file mode 100644 index 79e7c0fa4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 branch: Created from HEAD -279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file -08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 6a9c5917a..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 branch: Created from HEAD -c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop -18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop -7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop -6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking deleted file mode 100644 index 81521b06f..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 branch: Created from HEAD -31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year -3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh -d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh -dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool -687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice -17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha -c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah -5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 20c99ff0a..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit -31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master -442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master -ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master -c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index f188d6a1c..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 branch: Created from HEAD -08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 deleted file mode 100644 index 4fd3d95f4c568b9122d51e5a638682282500148f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V0?l(cOho3OVH&#$9P3HX&H(^Xn6O9cEziUhCSd zV|Qt%s`Wr2lL#aN<)FfWb(F=Yg{j22FhUYUbEH$>&3fblkqCkUag0z!hf_^vwu z1<5Ix^l7jCw9{i0cyw`_y(P2b44q&f60MluoYWk;c%DSof0Ur}N4s8!c AYXATM diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e2f8c317030a30193aef9945f0c8afa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmV-$0FVE80V^p=O;s>7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 deleted file mode 100644 index 25389c9d662fa3c7c7b5b9b2c4a41240d70f394f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmbL%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkxQPJ}D5PW-r6!l;7gaJOOuWvysr0#!pe$qVY%BjQe#sxdK}}1`%tRw`G|d zI1HC|h=3#u+6Sy zUz9zwkEXoav>nh7aPNnwe9E%FNW!)Q!&CCiqpb&Mf8& H!T&z+&6r3a diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb deleted file mode 100644 index a58cdfd1c390d5973fb705281d1084dfcd9e5d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmV;Q0AT-k0gaDK3c@fDKwak)*$Xn$nS2T&LRURTn@q6KG^IxI_y)Xy+s9kH7fQ}c z)g8jA9wNG9n;d&5;KdR_2(ttRL*f9DO*E7&M^^iE$X0bQkenbnGf@+K=)AX)XF@`6 zT%U-s?+DfOs*iH$Vbs@Qyvt|G`zn`E@=c>fXB{$uJ|h6AMq5;sKXsLs7VkpVTELH%bw9K4Tg}l<-q|_n>Gli0j#1aKh^<0JY{LH*` Yg_3-Q7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 deleted file mode 100644 index 1cafb95f9172da116f05816fbf223f92099aebbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmV;B0B`?z0V^p=O;s>5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^REF3kHx*dILv-8YpWOTEb+SjySa$=GydlG#%N_yM3vczORPMZ) ya%(Zurr&etASp0rc)Ttqw}t(MLG|q8mCE}nPBJ?5=OHODA*8?*s{#O;Tv8UZnMM@= diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26067e0a43b68d14777da3f61ddfcceac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 deleted file mode 100644 index 99177464395aa927a36557643ce3e4e536679578..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>ONEk*#1aKh^<0JY{LH*` Yg_3-Q4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q65Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0b7+cS1WIcHNshZ>FQU(XVB964q`+k~d_ybJ-)Hdf~19l**kq zQ*JG0+Vp$w93%zC43F2v7HD)k0FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^Z_#002M^ExDCi(6FlVrV00j?MM;EUAyyR4c(t`Xvg+zst%-mFkl8n@%RE6@y mVxT}qeo=8Mmn{U~SDKq&3RG$b0SYOpWvMy&1zZ3SiX=>?Kq37A diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd deleted file mode 100644 index e8d63bced5a790cf612ba77d98cf03e888d91233..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0y9GGs6`FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7jvWBSN{0B< C>3I79 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 deleted file mode 100644 index 74bc806ad..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]ATzI34)ɴMK0 |>o\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 deleted file mode 100644 index 7fafc3d92c64b6e4942abbc24ad93ebcded0baec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0gaALYC|y$2D|ntv@aA(cKrjT6tc=OWWP@&Q0E25h2-`P^a9-uGcbK0 zUdS&mud(!9B!asFq=XqQ7SCLKJ PPD3yBfKK-dupmQ8?uAU3 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 deleted file mode 100644 index cc8df6e44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 +++ /dev/null @@ -1,2 +0,0 @@ -xK -@ @])dU N[</quj-&IDeyJc1!57 (4Gq}dp9<87~X|IUedoJJteuO~6%SXa40pmOk z3s=V0KxiuUhGtS^Y6#2)Dtol3O3%rhL5Z7_vNHN9#VFklej8i4j3TV0&U^nWeH~Kd NeFssJdjPfiP{E>uGQ4g3%pYvzD&lvWcY&Pr_@JZHVP-@|e008rm4L|?@ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 deleted file mode 100644 index 66cca675c..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]d&D<$PR x/-^]D #aƐ.s]88rbԑsaP+oroB%G.R؉g Y\כROIgFDij\=[fy,?w \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 deleted file mode 100644 index 27ac61738744e4923b0d928f7521dd5707074712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 deleted file mode 100644 index bfb5376c67ba79deb64b9463958ebd99b0ed9f64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 deleted file mode 100644 index 236b6cdf4f4a62168a2e0b0b9b49cdcdbc22c808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Lxqxz#1aKh^<0JY{LH*` Yg_3-QZ^Jfvdf*ePpBUKJ6Elb)w~`coIV9<8tPmz`5L J@dfdm diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 deleted file mode 100644 index f43fa73ed..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]dI3DzLh1%DoxXKY; D.'L8k``FZE&"5jƚ9&u8!qV՗`6or܁,e2Lz -e8@N \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 deleted file mode 100644 index c41ae5c621a9bf45b6c82cc55ae9068918c3caa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmV-O0k{5m0V^p=O;s>4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6)pd#Os`!N}me}$};B8w({TNm;CV?)U>qBoK!=Gj>B{A aXr7$<7VkpVTELH%bw9K4Tg}l<-q|_n>BZZQT#1aKh^<0JY{LH*` Yg_3-Q4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do((@nIYt_` BMEw8& diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd deleted file mode 100644 index cdd5f8a937e758f7ae915812f83d48cfa5d7ef50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>3x$%5#1aKh^<0JY{LH*` Yg_3-Q8G-fa~FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm|#@^04{ye Es|G`_Y5)KL diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86c56c088175e46f1590082f30deb89cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsu`~^A08nuUMF0Q* diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c deleted file mode 100644 index 7302ca34e9d34bcda37b5a408f6b509933d555f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Q-zX@#1aKh^<0JY{LH*` Yg_3-Q7VkpVTELH%bw9K4Tg}l<-q|_n>6NQqD#1aKh^<0JY{LH*` Yg_3-Qb%7 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 deleted file mode 100644 index 008bb1a6567766c154b88180e8aa85b15392362c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmV+w0qXvE0V^p=O;s>9GiER}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7i&B$I@{1}N5++{f+*JBpNKlqBcea)P7Qf_=-=LGp0gaA93c@fD06pgwdlw{|Cc6Gp0gaA93c@fD06pgwdlzIk*=!7m2tD-~NxHQKYf6de^DX!Rufq&Xsmn4q zu*iqDsX{nA5gC+I$=TWzbu1P=#UK(!Pfm!=#j{z{rq2d`C{~f8 zhSTWGAj$byoIw?ox7K)14J#wv9=D=4A*JC^C#B*!I#wP4akzSjkѦ>x׵sN(풋1,NBZ(;\K/R ShC8"ֶSU͡R~26_z1@ \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 deleted file mode 100644 index ab357ec23a607497ddef075b5880fd9579922e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq+<0V^p=O;s>4Fl8__FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMIIe0T3vpWEQ0+m*f{!G9*mA&bg`d zxsaeNWA1D#|1EyWAHP9OOUukjHDu^GJm-$)$*DgcF0(o7@qG8Sn>jmn003Pvs7;ya BlW+h4 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 deleted file mode 100644 index 035d7ebefa5f4760d14464c4aee16160a6970cfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0gaA9YQr!P0DIOe_Ff3P(poD)DTSQ;jJ32PfjTy}LYv>mkPqZK%)pdo zp06D|$w%MJfP^)b%*>^!AjagYFb=uqrg^eKID7WRt-9H*L#X5_1mRLsoDx&Rz!K9S zRB;-bFG)}-I=%PHvcY+Tuk-k0|2nU~b}GyK4HQYD5C?=$LPU4aW2)Pmy4$TRw+gQe U_WSgw4>0Y}Hrp@m366z9cnq6VZvX%Q diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 deleted file mode 100644 index 198bff1ec786820e0c2f41db6e2bed90f1e103fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmV;)05<=40V^p=O;s>5HfJz2FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRl&pn2ozE>i&B$I@{1}N5++{f z+*JBpNKlqBcea)P7Qf_=-=L5w`4FhFfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GxD20);Yl3A3RT#{c@$&fJdI_IX+=R$(AjJdO|{I~cefBXhDEiE%A)sUg% d@SHoEC#U{+xXk9P$MfCSZszRR0RVyibtbb-a`^xN diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 deleted file mode 100644 index aa4879a75..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]df$DzdfBkK-xw{e]{Fh xTI9yQTL,0j7>kT@GRJ*@ -#ifƅK6 .tOZd]@bwGBDT?u{UUPf>? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c +++ /dev/null @@ -1 +0,0 @@ -x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictUndo/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/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e deleted file mode 100644 index 3a7ee91eab601eb205b04a6e1e62c58599193222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 deleted file mode 100644 index 714e20cb7eb8a76c9832939c1e2a103d78bb257d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>bA^(O#1aKh^<0JY{LH*` Yg_3-Q>!qSWM){Gv*Rgo)QVH8F=H?^FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm=IE6id6vs H4=>-(3qr6K diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 deleted file mode 100644 index 4992422c7407bf6efc09d23127726c19cec1119d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>V}+88#1aKh^<0JY{LH*` Yg_3-Q5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0eS?hqn=r4HCq1PXDguIm6t(FP;-g-jLzWWsiXBg}3@sDtF#Y yxwV*S)9<-+kQ5j*JYE-*+rs|BpnCT4O67eOCm9|3^N@@RRI7%&rx)LLPgyG diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 deleted file mode 100644 index e9f9f0881a1460f9b019818b1cbd6e4f67fe70aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6ZbrQLc@`W;jN4S diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch deleted file mode 100644 index 60c28ebd6..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch +++ /dev/null @@ -1 +0,0 @@ -4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index b4d7d5850..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -82db6d0e4502f489719ea0f3dbe7e14413c6d28a diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking deleted file mode 100644 index 02e8ef0f4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking +++ /dev/null @@ -1 +0,0 @@ -c50f7e1375a30118c2886d4b31318579f3419231 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index d4f5ac796..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -279f068805e089660f7ddd17ff32f66100e0dca5 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index d324b15b4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -8cd762c119834784fdbf97e9bb3b4c15e804ebaa diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking1 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking1 deleted file mode 100644 index 6101e9354..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking1 +++ /dev/null @@ -1 +0,0 @@ -this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking2 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking2 deleted file mode 100644 index 889b0fdfe..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking2 +++ /dev/null @@ -1 +0,0 @@ -this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking3 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking3 deleted file mode 100644 index eb90e8d7b..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking3 +++ /dev/null @@ -1 +0,0 @@ -this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking4 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking4 deleted file mode 100644 index b4121e2d6..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking4 +++ /dev/null @@ -1 +0,0 @@ -this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking5 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking5 deleted file mode 100644 index afa76754c..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking5 +++ /dev/null @@ -1 +0,0 @@ -this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking6 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking6 deleted file mode 100644 index 18f469bc7..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking6 +++ /dev/null @@ -1 +0,0 @@ -this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking7 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking7 deleted file mode 100644 index e448ae5bf..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking7 +++ /dev/null @@ -1 +0,0 @@ -this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking8 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking8 deleted file mode 100644 index 90a84fd62..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking8 +++ /dev/null @@ -1 +0,0 @@ -this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking9 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking9 deleted file mode 100644 index 22b0fd807..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking9 +++ /dev/null @@ -1 +0,0 @@ -this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/directory/file b/test/integration/mergeConflictUndo/expected/repo/directory/file deleted file mode 100644 index 9165a12a9..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/directory/file +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -test3 -======= -test2 ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/directory/file2 b/test/integration/mergeConflictUndo/expected/repo/directory/file2 deleted file mode 100644 index 9165a12a9..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/directory/file2 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -test3 -======= -test2 ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/file b/test/integration/mergeConflictUndo/expected/repo/file deleted file mode 100644 index 2410ee12b..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -new2\noriginal2\noriginal3 diff --git a/test/integration/mergeConflictUndo/expected/repo/file1 b/test/integration/mergeConflictUndo/expected/repo/file1 deleted file mode 100644 index 5d874a902..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file1 +++ /dev/null @@ -1,63 +0,0 @@ -Here is a story that has been told throuhg the ages -once upon a time there was a cat -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another dog diff --git a/test/integration/mergeConflictUndo/expected/repo/file3 b/test/integration/mergeConflictUndo/expected/repo/file3 deleted file mode 100644 index 32d15fd44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file3 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -once upon a time there was a horse -======= -once upon a time there was a mouse ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/file4 b/test/integration/mergeConflictUndo/expected/repo/file4 deleted file mode 100644 index 32d15fd44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file4 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -once upon a time there was a horse -======= -once upon a time there was a mouse ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/file5 b/test/integration/mergeConflictUndo/expected/repo/file5 deleted file mode 100644 index 32d15fd44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file5 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -once upon a time there was a horse -======= -once upon a time there was a mouse ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/recording.json b/test/integration/mergeConflictUndo/recording.json deleted file mode 100644 index efb7e9c14..000000000 --- a/test/integration/mergeConflictUndo/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":428,"Mod":0,"Key":256,"Ch":32},{"Timestamp":540,"Mod":0,"Key":256,"Ch":99},{"Timestamp":732,"Mod":0,"Key":256,"Ch":97},{"Timestamp":789,"Mod":0,"Key":256,"Ch":115},{"Timestamp":820,"Mod":0,"Key":256,"Ch":100},{"Timestamp":980,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1445,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1796,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1949,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2037,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2700,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2932,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3612,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3941,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4125,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4348,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4677,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4884,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5364,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5596,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6244,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6532,"Mod":0,"Key":257,"Ch":0},{"Timestamp":6716,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7348,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7588,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8772,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]} \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/setup.sh b/test/integration/mergeConflictUndo/setup.sh deleted file mode 100644 index 5182e5eae..000000000 --- a/test/integration/mergeConflictUndo/setup.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - - -function add_spacing { - for i in {1..60} - do - echo "..." >> $1 - done -} - -mkdir directory -echo "test1" > directory/file -echo "test1" > directory/file2 - - -echo "Here is a story that has been told throuhg the ages" >> file1 - -git add file1 -git add directory -git commit -m "first commit" - -git checkout -b feature/cherry-picking - -echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 -echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 - -git add . - -git commit -am "first commit freshman year" - -echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 - -git add . - -git commit -am "second commit subway eat fresh" - -echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 - -git add . - -git commit -am "third commit fresh" - -echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 - -git add . - -git commit -am "fourth commit cool" - -echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 - -git add . - -git commit -am "fifth commit nice" - -echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 - -git add . - -git commit -am "sixth commit haha" - -echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 - -git add . - -git commit -am "seventh commit yeah" - -echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 - -git add . - -git commit -am "eighth commit woo" - - -git checkout -b develop -echo "once upon a time there was a dog" >> file1 -add_spacing file1 -echo "once upon a time there was another dog" >> file1 -git add file1 -echo "test2" > directory/file -echo "test2" > directory/file2 -git add directory -git commit -m "first commit on develop" - - -git checkout master -echo "once upon a time there was a cat" >> file1 -add_spacing file1 -echo "once upon a time there was another cat" >> file1 -git add file1 -echo "test3" > directory/file -echo "test3" > directory/file2 -git add directory -git commit -m "first commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file3 -git add file3 -git commit -m "second commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file3 -git add file3 -git commit -m "second commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file4 -git add file4 -git commit -m "third commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file4 -git add file4 -git commit -m "third commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file5 -git add file5 -git commit -m "fourth commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file5 -git add file5 -git commit -m "fourth commit on master" - - -# this is for the autostash feature - -git checkout -b base_branch - -echo "original1\noriginal2\noriginal3" > file -git add file -git commit -m "file" - -git checkout -b other_branch - -git checkout base_branch - -echo "new1\noriginal2\noriginal3" > file -git add file -git commit -m "file changed" - -git checkout other_branch - -echo "new2\noriginal2\noriginal3" > file diff --git a/test/integration/mergeConflictUndo/test.json b/test/integration/mergeConflictUndo/test.json deleted file mode 100644 index 5ce11f66a..000000000 --- a/test/integration/mergeConflictUndo/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we make use of the undo feature in the merge conflict context", "speed": 12 } From 65bd0ab4316d0ca30549b889df4d48a841b48317 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 15:27:13 +1100 Subject: [PATCH 11/11] migrate undo test --- pkg/gui/controllers/undo_controller.go | 6 +- pkg/integration/tests/tests_gen.go | 2 + pkg/integration/tests/undo/undo_drop.go | 90 ++++++++++++++++++ .../expected/repo/.git_keep/COMMIT_EDITMSG | 24 ----- .../undo/expected/repo/.git_keep/FETCH_HEAD | 0 .../undo/expected/repo/.git_keep/HEAD | 1 - .../undo/expected/repo/.git_keep/ORIG_HEAD | 1 - .../undo/expected/repo/.git_keep/config | 10 -- .../undo/expected/repo/.git_keep/description | 1 - .../undo/expected/repo/.git_keep/index | Bin 353 -> 0 bytes .../undo/expected/repo/.git_keep/info/exclude | 7 -- .../undo/expected/repo/.git_keep/logs/HEAD | 20 ---- .../repo/.git_keep/logs/refs/heads/branch2 | 11 --- .../repo/.git_keep/logs/refs/heads/master | 4 - .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 36 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 24 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 31 -> 0 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 127 -> 0 bytes .../3e/4f2b1aeb076cff592279f94b1f495442690521 | Bin 147 -> 0 bytes .../4f/77a25a15ccca0273baa522f7281727f31ceeb8 | 2 - .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 126 -> 0 bytes .../5d/2b236ff0e8342ef1e531506f6f99070d53cf25 | Bin 147 -> 0 bytes .../68/ac4e416c01408d37c59465852aa1856a4abdb1 | Bin 146 -> 0 bytes .../6d/95d7a7842625152ba887482879dfdaf247f591 | Bin 119 -> 0 bytes .../7c/e8eac65e3ae50cb50a570dc775b745464f3a3e | Bin 148 -> 0 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 127 -> 0 bytes .../99/36b8f380c2937bb457ade468bfc7dc850293f9 | Bin 153 -> 0 bytes .../9d/187b7f4819a69996dd27e3d66a5224e05d9f41 | Bin 150 -> 0 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 30 -> 0 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 127 -> 0 bytes .../fc/f46511d7819220e0cc310ae6d891fadfdb79aa | 3 - .../repo/.git_keep/refs/heads/branch2 | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - test/integration/undo/expected/repo/file0 | 1 - test/integration/undo/expected/repo/file1 | 1 - test/integration/undo/expected/repo/file2 | 1 - test/integration/undo/expected/repo/file4 | 3 - test/integration/undo/recording.json | 1 - test/integration/undo/setup.sh | 40 -------- test/integration/undo/test.json | 1 - 46 files changed, 95 insertions(+), 139 deletions(-) create mode 100644 pkg/integration/tests/undo/undo_drop.go delete mode 100644 test/integration/undo/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/undo/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/undo/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/undo/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/undo/expected/repo/.git_keep/config delete mode 100644 test/integration/undo/expected/repo/.git_keep/description delete mode 100644 test/integration/undo/expected/repo/.git_keep/index delete mode 100644 test/integration/undo/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/undo/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/undo/expected/repo/.git_keep/logs/refs/heads/branch2 delete mode 100644 test/integration/undo/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a delete mode 100644 test/integration/undo/expected/repo/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa delete mode 100644 test/integration/undo/expected/repo/.git_keep/refs/heads/branch2 delete mode 100644 test/integration/undo/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/undo/expected/repo/file0 delete mode 100644 test/integration/undo/expected/repo/file1 delete mode 100644 test/integration/undo/expected/repo/file2 delete mode 100644 test/integration/undo/expected/repo/file4 delete mode 100644 test/integration/undo/recording.json delete mode 100644 test/integration/undo/setup.sh delete mode 100644 test/integration/undo/test.json diff --git a/pkg/gui/controllers/undo_controller.go b/pkg/gui/controllers/undo_controller.go index 5e0bf5730..19fc19e27 100644 --- a/pkg/gui/controllers/undo_controller.go +++ b/pkg/gui/controllers/undo_controller.go @@ -195,17 +195,17 @@ func (self *UndoController) parseReflogForActions(onUserAction func(counter int, counter++ } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^\[lazygit redo\]`); ok { counter-- - } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(abort\)|^rebase -i \(finish\)`); ok { + } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase (-i )?\(abort\)|^rebase (-i )?\(finish\)`); ok { rebaseFinishCommitSha = reflogCommit.Sha } else if ok, match := utils.FindStringSubmatch(reflogCommit.Name, `^checkout: moving from ([\S]+) to ([\S]+)`); ok { action = &reflogAction{kind: CHECKOUT, from: match[1], to: match[2]} } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^commit|^reset: moving to|^pull`); ok { action = &reflogAction{kind: COMMIT, from: prevCommitSha, to: reflogCommit.Sha} - } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok { + } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase (-i )?\(start\)`); ok { // if we're here then we must be currently inside an interactive rebase action = &reflogAction{kind: CURRENT_REBASE, from: prevCommitSha} } - } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok { + } else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase (-i )?\(start\)`); ok { action = &reflogAction{kind: REBASE, from: prevCommitSha, to: rebaseFinishCommitSha} rebaseFinishCommitSha = "" } diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index c3637cbb9..2be0b902c 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -20,6 +20,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/stash" "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule" "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" + "github.com/jesseduffield/lazygit/pkg/integration/tests/undo" ) var tests = []*components.IntegrationTest{ @@ -83,4 +84,5 @@ var tests = []*components.IntegrationTest{ sync.Pull, sync.PullAndSetUpstream, sync.RenameBranchAndPull, + undo.UndoDrop, } diff --git a/pkg/integration/tests/undo/undo_drop.go b/pkg/integration/tests/undo/undo_drop.go new file mode 100644 index 000000000..bb3cbe1aa --- /dev/null +++ b/pkg/integration/tests/undo/undo_drop.go @@ -0,0 +1,90 @@ +package undo + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var UndoDrop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Drop some commits and then undo/redo the actions", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.EmptyCommit("four") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + confirmCommitDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete Commit")). + Content(Equals("Are you sure you want to delete this commit?")). + Confirm() + } + + confirmUndo := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Undo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Confirm() + } + + confirmRedo := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Redo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Confirm() + } + + t.Views().Commits().Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + Lines( + Contains("two").IsSelected(), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(confirmUndo). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(confirmUndo). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Redo). + Tap(confirmRedo). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Redo). + Tap(confirmRedo). + Lines( + Contains("two").IsSelected(), + Contains("one"), + ) + }, +}) diff --git a/test/integration/undo/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/undo/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 2e97e3406..000000000 --- a/test/integration/undo/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,24 +0,0 @@ -# This is a combination of 2 commits. -# This is the 1st commit message: - -file4 - -# This is the commit message #2: - -file4 - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# Date: Tue Apr 6 14:29:30 2021 +1000 -# -# interactive rebase in progress; onto 68ac4e4 -# Last commands done (2 commands done): -# pick fcf4651 file4 -# squash 9d187b7 file4 -# No commands remaining. -# You are currently rebasing branch 'branch2' on '68ac4e4'. -# -# Changes to be committed: -# new file: file4 -# diff --git a/test/integration/undo/expected/repo/.git_keep/FETCH_HEAD b/test/integration/undo/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/undo/expected/repo/.git_keep/HEAD b/test/integration/undo/expected/repo/.git_keep/HEAD deleted file mode 100644 index 1d57c9ea7..000000000 --- a/test/integration/undo/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/branch2 diff --git a/test/integration/undo/expected/repo/.git_keep/ORIG_HEAD b/test/integration/undo/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index ed9815e19..000000000 --- a/test/integration/undo/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7ce8eac65e3ae50cb50a570dc775b745464f3a3e diff --git a/test/integration/undo/expected/repo/.git_keep/config b/test/integration/undo/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/undo/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/undo/expected/repo/.git_keep/description b/test/integration/undo/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/undo/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/undo/expected/repo/.git_keep/index b/test/integration/undo/expected/repo/.git_keep/index deleted file mode 100644 index f347af7db01f63346167dfb9d2798fb41d70c25d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmW1rbtHf8m(}U5BKruEw=M@YLjY}997{3D5hyXF0g^1Oa1^=|R zy$e3{zH{l#M|-E5-eO=)%gjkN07^43fb>i3W!(>>q2}yIH)rXd$A48*Z+wXejpE67 zx)9*i(tQsP%?xXG&H&8;(-3o9=AfG+!SlnYL22K)m#Y?qSM|5N(w=Xj4l&0F zX3jd55)DqEIba%UPBWT0vOHRg``8#BT)NMB=!aX%jfMW5Gb$nGn1Ia*337D>G9(#H x6b!g*H*w@waLar%dUt4|;CstR;T5a3T@{|K*d?VhPh+BAUu{RKLAut&g#ar>ah?DG diff --git a/test/integration/undo/expected/repo/.git_keep/info/exclude b/test/integration/undo/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/undo/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/undo/expected/repo/.git_keep/logs/HEAD b/test/integration/undo/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index faf40ba78..000000000 --- a/test/integration/undo/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,20 +0,0 @@ -0000000000000000000000000000000000000000 6d95d7a7842625152ba887482879dfdaf247f591 CI 1617683370 +1000 commit (initial): file0 -6d95d7a7842625152ba887482879dfdaf247f591 4f77a25a15ccca0273baa522f7281727f31ceeb8 CI 1617683370 +1000 commit: file1 -4f77a25a15ccca0273baa522f7281727f31ceeb8 68ac4e416c01408d37c59465852aa1856a4abdb1 CI 1617683370 +1000 commit: file2 -68ac4e416c01408d37c59465852aa1856a4abdb1 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 commit: file4 -fcf46511d7819220e0cc310ae6d891fadfdb79aa fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 checkout: moving from master to branch2 -fcf46511d7819220e0cc310ae6d891fadfdb79aa 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683370 +1000 commit: file4 -5d2b236ff0e8342ef1e531506f6f99070d53cf25 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683370 +1000 commit: file4 -3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683370 +1000 commit: file2 -7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (start): checkout 3e4f2b1aeb076cff592279f94b1f495442690521 -3e4f2b1aeb076cff592279f94b1f495442690521 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (finish): returning to refs/heads/branch2 -3e4f2b1aeb076cff592279f94b1f495442690521 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683373 +1000 rebase -i (start): checkout fcf46511d7819220e0cc310ae6d891fadfdb79aa -5d2b236ff0e8342ef1e531506f6f99070d53cf25 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (fixup): file4 -9d187b7f4819a69996dd27e3d66a5224e05d9f41 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (finish): returning to refs/heads/branch2 -9d187b7f4819a69996dd27e3d66a5224e05d9f41 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683374 +1000 rebase -i (start): checkout 68ac4e416c01408d37c59465852aa1856a4abdb1 -fcf46511d7819220e0cc310ae6d891fadfdb79aa 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (squash): file4 -9936b8f380c2937bb457ade468bfc7dc850293f9 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (finish): returning to refs/heads/branch2 -9936b8f380c2937bb457ade468bfc7dc850293f9 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683376 +1000 [lazygit undo]: updating HEAD -9d187b7f4819a69996dd27e3d66a5224e05d9f41 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683377 +1000 [lazygit undo]: updating HEAD -3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683377 +1000 [lazygit undo]: updating HEAD -7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683379 +1000 [lazygit redo]: updating HEAD diff --git a/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 7b49f493a..000000000 --- a/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,11 +0,0 @@ -0000000000000000000000000000000000000000 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 branch: Created from HEAD -fcf46511d7819220e0cc310ae6d891fadfdb79aa 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683370 +1000 commit: file4 -5d2b236ff0e8342ef1e531506f6f99070d53cf25 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683370 +1000 commit: file4 -3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683370 +1000 commit: file2 -7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (finish): refs/heads/branch2 onto 3e4f2b1aeb076cff592279f94b1f495442690521 -3e4f2b1aeb076cff592279f94b1f495442690521 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (finish): refs/heads/branch2 onto fcf46511d7819220e0cc310ae6d891fadfdb79aa -9d187b7f4819a69996dd27e3d66a5224e05d9f41 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (finish): refs/heads/branch2 onto 68ac4e416c01408d37c59465852aa1856a4abdb1 -9936b8f380c2937bb457ade468bfc7dc850293f9 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683376 +1000 [lazygit undo]: updating HEAD -9d187b7f4819a69996dd27e3d66a5224e05d9f41 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683377 +1000 [lazygit undo]: updating HEAD -3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683377 +1000 [lazygit undo]: updating HEAD -7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683379 +1000 [lazygit redo]: updating HEAD diff --git a/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e973b2106..000000000 --- a/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 6d95d7a7842625152ba887482879dfdaf247f591 CI 1617683370 +1000 commit (initial): file0 -6d95d7a7842625152ba887482879dfdaf247f591 4f77a25a15ccca0273baa522f7281727f31ceeb8 CI 1617683370 +1000 commit: file1 -4f77a25a15ccca0273baa522f7281727f31ceeb8 68ac4e416c01408d37c59465852aa1856a4abdb1 CI 1617683370 +1000 commit: file2 -68ac4e416c01408d37c59465852aa1856a4abdb1 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 commit: file4 diff --git a/test/integration/undo/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2c4712a28ba59b99a0ddd33f70433acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< diff --git a/test/integration/undo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/undo/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/undo/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258e5362e874f0cd17fc6c260a82c41501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb|y2)08mZ`J^%m! diff --git a/test/integration/undo/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7c0189f1a7f6fc780332ce07230ba16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 diff --git a/test/integration/undo/expected/repo/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 b/test/integration/undo/expected/repo/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 deleted file mode 100644 index 171f5e1db62c604c0f6f6ace10e5366c31494765..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW}3c@fHKvBn8MdpIMPxAv2p`$J%N#DalV@rwP^6e6wUe4gwt+l0F zOmyjoh~>EuM6V%2!K$7~q*6jeQBE!)=a>r>v*$zJ-MX0yu~!9&Jdh}gV|3uvYf2Dc zc3hR5$)En(4m(cvK2A^h=C-eLt6O_m^cZ|(4q&ec0OqXcRF^-w(Pfpv`~WYtIQV~P BNL~N{ diff --git a/test/integration/undo/expected/repo/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 b/test/integration/undo/expected/repo/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 deleted file mode 100644 index 03e728678..000000000 --- a/test/integration/undo/expected/repo/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=BqFQ(U1& =~sn?ou[׹[xG8&լ겨OmR[0- "NsiEn1OmF{gʺ/@gg3g=z6/] 9 \ No newline at end of file diff --git a/test/integration/undo/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed50454974ab7775c9d85cee55477580ac83e835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_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 gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 diff --git a/test/integration/undo/expected/repo/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 b/test/integration/undo/expected/repo/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 deleted file mode 100644 index a5b4f0d4e283fed559b9a908ac8608bad7f1f9cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcX03c@fDhGEw^MfQTsYyt}SkUGRuQkH%oYY!OI8NfTBo zwd6PvDf;x+e(HJA_j!5Bm)fz(jraD@7%+x3vY@XB0BWq`RF^-ws_Q0B{Q%KdIy{-F BNqztT diff --git a/test/integration/undo/expected/repo/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 b/test/integration/undo/expected/repo/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 deleted file mode 100644 index f1bf22f4dc827c4402584a4498426c0f3ed488f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaA93c@fD06pgwxeJornC=Q9LQj3hX0yRUV@rwP^X(J74#P0Iwl;SU zH$3&-%-@VzC=}(wSPDwbwWI(vSS2=K#+Vh=ZL-_D`)ef4vw#6>Gwugt|$a9Po{24+B?x4q1w?B1P=f%+d0NATK95W?G AzW@LL diff --git a/test/integration/undo/expected/repo/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 b/test/integration/undo/expected/repo/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 deleted file mode 100644 index 5dd318b9712a36232ccac497d114f6e70da2bbc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10gcT;3c@fDMq$@E#q0%{NyelB5uvLdBWeC%p`oQj@c8x!ZXX}Kd24Oy zB&wHw03>kmA;%a?mV5B22*5+GTG{4OZG=WuYtpB`w}Zxs9^>@FH?@7mZQk0G#7ppl ZbAjn9%xunjPCEYNrY(<)R zttYtjL&Qo-7y-CK&gf>4!l*)7IVjJVBvB5Y*zA1ByW2s6Lh&rcC9JBE01_#M;x$kV z0gzk-Z}`(++hNDa-pA=FUvB#rf-^_=SRCpWsR0_F!^pgACS CDoK3+ diff --git a/test/integration/undo/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335181ed440a54f52297d3cb1ab3a70222..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 hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 diff --git a/test/integration/undo/expected/repo/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 b/test/integration/undo/expected/repo/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 deleted file mode 100644 index aeb252f851f89d126242aaf7006489938b49d3bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmV;K0A~Mq0fmmc3d1lA06Y6Dycde)hb%)Wg-rPj*^y}=ZbEROpWh7GI~^Q1Tv=P2 zyM~l5eHYPg%GMCpNG3z6=&VSw2>_(J6cRWl&Ni!!cX@Y>#KnsTEC#%x$;A?q$3Vd{ z0|jKydCH*p(_ibZhf&{$@hM+!+akBJwuc6Uh~!)}`U=Jvb=YI7%b(nzxvKLbUY+;> Hy&pQ=m=;Mn diff --git a/test/integration/undo/expected/repo/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 b/test/integration/undo/expected/repo/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 deleted file mode 100644 index e1d183bb8f7b5dcb65e84f100c9252d08ec8a6a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0fmms3c@fD06pg`au;Mb+vWixLQnmSO|pvxV@rwP=i7sKufs4*SzBAW z#pF(X7qL{cgXlFx$XL{q6Dcksq9~;?A#vpFve|f-SGQVp@FQXk@n|>@D1{JMe2oc} ztJWM6v*CAtth=3Nd!6RHe7J2-xsPx# diff --git a/test/integration/undo/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06dda15fe1901a7942e7954b700b36bfa9..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{S2gv2WLwJR>kD diff --git a/test/integration/undo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/undo/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/undo/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/undo/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/undo/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/undo/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee261a5c479d905ee8318e897bf4bca8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb~-q%PKJUL9GL*(lMbH% diff --git a/test/integration/undo/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3f282798a9dd14ae1222a66d0c4a783a..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%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ diff --git a/test/integration/undo/expected/repo/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa b/test/integration/undo/expected/repo/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa deleted file mode 100644 index 35d0eab8b..000000000 --- a/test/integration/undo/expected/repo/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa +++ /dev/null @@ -1,3 +0,0 @@ -xA - @Ѯ=BqtJ)dc & =~sn?oekmCNa~kJp>ij'gv>m"T$Ă)R@11r*vaa|۾M ' -!;{99OneU4?O9- \ No newline at end of file diff --git a/test/integration/undo/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/undo/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index f152723fe..000000000 --- a/test/integration/undo/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -3e4f2b1aeb076cff592279f94b1f495442690521 diff --git a/test/integration/undo/expected/repo/.git_keep/refs/heads/master b/test/integration/undo/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index c4d4b22b4..000000000 --- a/test/integration/undo/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -fcf46511d7819220e0cc310ae6d891fadfdb79aa diff --git a/test/integration/undo/expected/repo/file0 b/test/integration/undo/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/undo/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/undo/expected/repo/file1 b/test/integration/undo/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/undo/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/undo/expected/repo/file2 b/test/integration/undo/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/undo/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/undo/expected/repo/file4 b/test/integration/undo/expected/repo/file4 deleted file mode 100644 index 0c2aa38e0..000000000 --- a/test/integration/undo/expected/repo/file4 +++ /dev/null @@ -1,3 +0,0 @@ -line one -line two -line three diff --git a/test/integration/undo/recording.json b/test/integration/undo/recording.json deleted file mode 100644 index 3c4161386..000000000 --- a/test/integration/undo/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":627,"Mod":0,"Key":259,"Ch":0},{"Timestamp":979,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1443,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1723,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2411,"Mod":0,"Key":256,"Ch":102},{"Timestamp":2811,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3515,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3994,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5490,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6490,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7387,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8428,"Mod":2,"Key":26,"Ch":26},{"Timestamp":9234,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/undo/setup.sh b/test/integration/undo/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/undo/setup.sh +++ /dev/null @@ -1,40 +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 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/undo/test.json b/test/integration/undo/test.json deleted file mode 100644 index 70ec964d0..000000000 --- a/test/integration/undo/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "undoing some changes to commits. Skipped because it's failing on CI for some reason", "speed": 10, "skip": true }