From 31d796ee750526a0d50d2e8665b104eb9edf1de6 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 13:38:15 +1100 Subject: [PATCH] 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 }