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 7f2ebf4ee..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ 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 0a734f981..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ 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 285df3e5f..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ 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 96d2e71a6..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ 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 fcaa0a878..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad and /dev/null differ 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 5e9361d35..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 and /dev/null differ 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 d39fa7d2f..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ 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 9b771fc2f..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ 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 e1d86f23c..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 and /dev/null differ 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 114e72ec5..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 and /dev/null differ 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 5c83b42dc..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/index and /dev/null differ 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 7f2ebf4ee..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ 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 0a734f981..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ 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 285df3e5f..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ 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 96d2e71a6..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ 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 fcaa0a878..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad and /dev/null differ 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 5e9361d35..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 and /dev/null differ 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 d39fa7d2f..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ 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 9b771fc2f..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ 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 e1d86f23c..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 and /dev/null differ 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 114e72ec5..000000000 Binary files a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 and /dev/null differ 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 7f2ebf4ee..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ 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 0a734f981..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ 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 c1564b80f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 and /dev/null differ 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 52bacd105..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936c and /dev/null differ 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 285df3e5f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ 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 96d2e71a6..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ 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 5e9361d35..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 and /dev/null differ 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 d39fa7d2f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ 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 9b771fc2f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ 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 9ec36686f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/index and /dev/null differ 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 7f2ebf4ee..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ 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 0a734f981..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ 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 c1564b80f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 and /dev/null differ 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 52bacd105..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936c and /dev/null differ 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 285df3e5f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ 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 96d2e71a6..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ 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 5e9361d35..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 and /dev/null differ 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 d39fa7d2f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ 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 9b771fc2f..000000000 Binary files a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ 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 -}