diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index bacd23a45..2087cd389 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -140,6 +140,10 @@ func (self *Shell) CreateLightweightTag(name string, ref string) *Shell { return self.RunCommand(fmt.Sprintf("git tag %s %s", name, ref)) } +func (self *Shell) CreateAnnotatedTag(name string, message string, ref string) *Shell { + return self.RunCommand(fmt.Sprintf("git tag -a %s -m \"%s\" %s", name, message, ref)) +} + // convenience method for creating a file and adding it func (self *Shell) CreateFileAndAdd(fileName string, fileContents string) *Shell { return self. diff --git a/pkg/integration/tests/sync/push.go b/pkg/integration/tests/sync/push.go new file mode 100644 index 000000000..9fa095697 --- /dev/null +++ b/pkg/integration/tests/sync/push.go @@ -0,0 +1,57 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Push = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push a commit to a pre-configured upstream", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.EmptyCommit("two") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Push) + + assertSuccessfullyPushed(t) + }, +}) + +func assertSuccessfullyPushed(t *TestDriver) { + 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("two"), + Contains("one"), + ) +} diff --git a/pkg/integration/tests/sync/push_and_auto_set_upstream.go b/pkg/integration/tests/sync/push_and_auto_set_upstream.go new file mode 100644 index 000000000..e8c8560e6 --- /dev/null +++ b/pkg/integration/tests/sync/push_and_auto_set_upstream.go @@ -0,0 +1,33 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PushAndAutoSetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push a commit and set the upstream automatically as configured by git", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + + shell.CloneIntoRemote("origin") + + shell.EmptyCommit("two") + + shell.SetConfig("push.default", "current") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // assert no mention of upstream/downstream changes + t.Views().Status().Content(MatchesRegexp(`^\s+repo → master`)) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Push) + + assertSuccessfullyPushed(t) + }, +}) diff --git a/pkg/integration/tests/sync/push_and_set_upstream.go b/pkg/integration/tests/sync/push_and_set_upstream.go new file mode 100644 index 000000000..a682832e1 --- /dev/null +++ b/pkg/integration/tests/sync/push_and_set_upstream.go @@ -0,0 +1,35 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PushAndSetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push a commit and set the upstream via a prompt", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + + shell.CloneIntoRemote("origin") + + shell.EmptyCommit("two") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // assert no mention of upstream/downstream changes + t.Views().Status().Content(MatchesRegexp(`^\s+repo → master`)) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Push) + + t.ExpectPopup().Prompt(). + Title(Equals("Enter upstream as ' '")). + SuggestionLines(Equals("origin master")). + ConfirmFirstSuggestion() + + assertSuccessfullyPushed(t) + }, +}) diff --git a/pkg/integration/tests/sync/push_follow_tags.go b/pkg/integration/tests/sync/push_follow_tags.go new file mode 100644 index 000000000..92a1074dc --- /dev/null +++ b/pkg/integration/tests/sync/push_follow_tags.go @@ -0,0 +1,56 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PushFollowTags = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push with --follow-tags configured in git config", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.EmptyCommit("two") + shell.CreateAnnotatedTag("mytag", "message", "HEAD") + + shell.SetConfig("push.followTags", "true") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Push) + + 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("two").Contains("mytag"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/push_no_follow_tags.go b/pkg/integration/tests/sync/push_no_follow_tags.go new file mode 100644 index 000000000..eb7d04dff --- /dev/null +++ b/pkg/integration/tests/sync/push_no_follow_tags.go @@ -0,0 +1,55 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PushNoFollowTags = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push with --follow-tags NOT configured in git config", + ExtraCmdArgs: "", + Skip: true, // turns out this actually DOES push the tag. I have no idea why + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.CreateAnnotatedTag("mytag", "message", "HEAD") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Status().Content(Contains("✓ repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Push) + + 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( + // tag was not pushed to upstream + Contains("two").DoesNotContain("mytag"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/push_tag.go b/pkg/integration/tests/sync/push_tag.go new file mode 100644 index 000000000..3a6739278 --- /dev/null +++ b/pkg/integration/tests/sync/push_tag.go @@ -0,0 +1,59 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PushTag = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push a specific tag", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + + shell.CloneIntoRemote("origin") + + shell.CreateAnnotatedTag("mytag", "message", "HEAD") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + Lines( + Contains("mytag"), + ). + Press(keys.Branches.PushTag) + + t.ExpectPopup().Prompt(). + Title(Equals("remote to push tag 'mytag' to:")). + InitialText(Equals("origin")). + SuggestionLines( + Contains("origin"), + ). + Confirm() + + t.Views().Remotes(). + Focus(). + Lines( + Contains("origin"), + ). + PressEnter() + + t.Views().RemoteBranches(). + IsFocused(). + Lines( + Contains("master"), + ). + PressEnter() + + t.Views().SubCommits(). + IsFocused(). + Lines( + Contains("two").Contains("mytag"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/push_with_credential_prompt.go b/pkg/integration/tests/sync/push_with_credential_prompt.go new file mode 100644 index 000000000..8c5341716 --- /dev/null +++ b/pkg/integration/tests/sync/push_with_credential_prompt.go @@ -0,0 +1,75 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PushWithCredentialPrompt = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Push a commit to a pre-configured upstream, where credentials are required", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.EmptyCommit("two") + + // actually getting a password prompt is tricky: it requires SSH'ing into localhost under a newly created, restricted, user. + // This is not easy to do in a cross-platform way, nor is it easy to do in a docker container. + // If you can think of a way to do it, please let me know! + shell.RunCommand("cp ../../../../../hooks/pre-push .git/hooks/pre-push") + shell.RunCommand("chmod +x .git/hooks/pre-push") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Push) + + // correct credentials are: username=username, password=password + + t.ExpectPopup().Prompt(). + Title(Equals("Username")). + Type("username"). + Confirm() + + // enter incorrect password + t.ExpectPopup().Prompt(). + Title(Equals("Password")). + Type("incorrect password"). + Confirm() + + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("incorrect username/password")). + Confirm() + + t.Views().Status().Content(Contains("↑1 repo → master")) + + // try again with correct password + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Push) + + t.ExpectPopup().Prompt(). + Title(Equals("Username")). + Type("username"). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Password")). + Type("password"). + Confirm() + + t.Views().Status().Content(Contains("✓ repo → master")) + + assertSuccessfullyPushed(t) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index c7cf462fe..815939599 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -103,6 +103,13 @@ var tests = []*components.IntegrationTest{ sync.ForcePushMultipleUpstream, sync.Pull, sync.PullAndSetUpstream, + sync.Push, + sync.PushAndAutoSetUpstream, + sync.PushAndSetUpstream, + sync.PushFollowTags, + sync.PushNoFollowTags, + sync.PushTag, + sync.PushWithCredentialPrompt, sync.RenameBranchAndPull, tag.Checkout, tag.CrudAnnotated, diff --git a/test/integration/push/expected/origin/HEAD b/test/integration/push/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/push/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/push/expected/origin/config b/test/integration/push/expected/origin/config deleted file mode 100644 index f190da0bc..000000000 --- a/test/integration/push/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/push/actual/./repo diff --git a/test/integration/push/expected/origin/description b/test/integration/push/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/push/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/push/expected/origin/info/exclude b/test/integration/push/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/push/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/push/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/push/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/push/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/14/6ca480a776a466024a08d273987c4b2e71f23b b/test/integration/push/expected/origin/objects/14/6ca480a776a466024a08d273987c4b2e71f23b deleted file mode 100644 index a3d79e190..000000000 --- a/test/integration/push/expected/origin/objects/14/6ca480a776a466024a08d273987c4b2e71f23b +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed&IDW=F:`X)n?oumm}3%E2H lVXđ32ψSHU6{v$F*R(UBŚ͕w|))GʈBp{ݧ]a~;9 \ No newline at end of file diff --git a/test/integration/push/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/push/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/push/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/push/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/push/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/push/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/push/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/69/fef9300b95338821093ec2dfb6e2974d303510 b/test/integration/push/expected/origin/objects/69/fef9300b95338821093ec2dfb6e2974d303510 deleted file mode 100644 index ea7faca6b..000000000 Binary files a/test/integration/push/expected/origin/objects/69/fef9300b95338821093ec2dfb6e2974d303510 and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/71/4500c4933e4316cc9747711829560cc42c2f8e b/test/integration/push/expected/origin/objects/71/4500c4933e4316cc9747711829560cc42c2f8e deleted file mode 100644 index ec5ba1314..000000000 --- a/test/integration/push/expected/origin/objects/71/4500c4933e4316cc9747711829560cc42c2f8e +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJ&N))1P!")#tyS5[ S`XzL%{puq8􈶭zK@&HB"zzNɝ}˲*3, \ No newline at end of file diff --git a/test/integration/push/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/push/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/push/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/push/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/push/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/push/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/push/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/push/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/push/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/push/expected/origin/objects/ee/53190e06796d55bf236a35d45249c90eff8594 b/test/integration/push/expected/origin/objects/ee/53190e06796d55bf236a35d45249c90eff8594 deleted file mode 100644 index ca0b896d7..000000000 Binary files a/test/integration/push/expected/origin/objects/ee/53190e06796d55bf236a35d45249c90eff8594 and /dev/null differ diff --git a/test/integration/push/expected/origin/packed-refs b/test/integration/push/expected/origin/packed-refs deleted file mode 100644 index 418f3935f..000000000 --- a/test/integration/push/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -146ca480a776a466024a08d273987c4b2e71f23b refs/heads/master diff --git a/test/integration/push/expected/origin/refs/heads/master b/test/integration/push/expected/origin/refs/heads/master deleted file mode 100644 index b77d8cdb7..000000000 --- a/test/integration/push/expected/origin/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -69fef9300b95338821093ec2dfb6e2974d303510 diff --git a/test/integration/push/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/push/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/push/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/push/expected/repo/.git_keep/FETCH_HEAD b/test/integration/push/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 26ee184b7..000000000 --- a/test/integration/push/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -146ca480a776a466024a08d273987c4b2e71f23b branch 'master' of ../origin diff --git a/test/integration/push/expected/repo/.git_keep/HEAD b/test/integration/push/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/push/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/push/expected/repo/.git_keep/config b/test/integration/push/expected/repo/.git_keep/config deleted file mode 100644 index 7721ae814..000000000 --- a/test/integration/push/expected/repo/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/push/expected/repo/.git_keep/description b/test/integration/push/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/push/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/push/expected/repo/.git_keep/index b/test/integration/push/expected/repo/.git_keep/index deleted file mode 100644 index b5391b42b..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/info/exclude b/test/integration/push/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/push/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/push/expected/repo/.git_keep/logs/HEAD b/test/integration/push/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 859603aeb..000000000 --- a/test/integration/push/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 714500c4933e4316cc9747711829560cc42c2f8e CI 1648348228 +1100 commit (initial): myfile1 -714500c4933e4316cc9747711829560cc42c2f8e 146ca480a776a466024a08d273987c4b2e71f23b CI 1648348228 +1100 commit: myfile2 -146ca480a776a466024a08d273987c4b2e71f23b ee53190e06796d55bf236a35d45249c90eff8594 CI 1648348228 +1100 commit: myfile3 -ee53190e06796d55bf236a35d45249c90eff8594 69fef9300b95338821093ec2dfb6e2974d303510 CI 1648348228 +1100 commit: myfile4 diff --git a/test/integration/push/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/push/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 859603aeb..000000000 --- a/test/integration/push/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 714500c4933e4316cc9747711829560cc42c2f8e CI 1648348228 +1100 commit (initial): myfile1 -714500c4933e4316cc9747711829560cc42c2f8e 146ca480a776a466024a08d273987c4b2e71f23b CI 1648348228 +1100 commit: myfile2 -146ca480a776a466024a08d273987c4b2e71f23b ee53190e06796d55bf236a35d45249c90eff8594 CI 1648348228 +1100 commit: myfile3 -ee53190e06796d55bf236a35d45249c90eff8594 69fef9300b95338821093ec2dfb6e2974d303510 CI 1648348228 +1100 commit: myfile4 diff --git a/test/integration/push/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/push/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 03b67d245..000000000 --- a/test/integration/push/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 146ca480a776a466024a08d273987c4b2e71f23b CI 1648348228 +1100 fetch origin: storing head -146ca480a776a466024a08d273987c4b2e71f23b 69fef9300b95338821093ec2dfb6e2974d303510 CI 1648348229 +1100 update by push diff --git a/test/integration/push/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/push/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/14/6ca480a776a466024a08d273987c4b2e71f23b b/test/integration/push/expected/repo/.git_keep/objects/14/6ca480a776a466024a08d273987c4b2e71f23b deleted file mode 100644 index a3d79e190..000000000 --- a/test/integration/push/expected/repo/.git_keep/objects/14/6ca480a776a466024a08d273987c4b2e71f23b +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed&IDW=F:`X)n?oumm}3%E2H lVXđ32ψSHU6{v$F*R(UBŚ͕w|))GʈBp{ݧ]a~;9 \ No newline at end of file diff --git a/test/integration/push/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/push/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/push/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/push/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/69/fef9300b95338821093ec2dfb6e2974d303510 b/test/integration/push/expected/repo/.git_keep/objects/69/fef9300b95338821093ec2dfb6e2974d303510 deleted file mode 100644 index ea7faca6b..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/69/fef9300b95338821093ec2dfb6e2974d303510 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/71/4500c4933e4316cc9747711829560cc42c2f8e b/test/integration/push/expected/repo/.git_keep/objects/71/4500c4933e4316cc9747711829560cc42c2f8e deleted file mode 100644 index ec5ba1314..000000000 --- a/test/integration/push/expected/repo/.git_keep/objects/71/4500c4933e4316cc9747711829560cc42c2f8e +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJ&N))1P!")#tyS5[ S`XzL%{puq8􈶭zK@&HB"zzNɝ}˲*3, \ No newline at end of file diff --git a/test/integration/push/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/push/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/push/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/push/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/push/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/ee/53190e06796d55bf236a35d45249c90eff8594 b/test/integration/push/expected/repo/.git_keep/objects/ee/53190e06796d55bf236a35d45249c90eff8594 deleted file mode 100644 index ca0b896d7..000000000 Binary files a/test/integration/push/expected/repo/.git_keep/objects/ee/53190e06796d55bf236a35d45249c90eff8594 and /dev/null differ diff --git a/test/integration/push/expected/repo/.git_keep/refs/heads/master b/test/integration/push/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index b77d8cdb7..000000000 --- a/test/integration/push/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -69fef9300b95338821093ec2dfb6e2974d303510 diff --git a/test/integration/push/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/push/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index b77d8cdb7..000000000 --- a/test/integration/push/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -69fef9300b95338821093ec2dfb6e2974d303510 diff --git a/test/integration/push/expected/repo/myfile1 b/test/integration/push/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/push/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/push/expected/repo/myfile2 b/test/integration/push/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/push/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/push/expected/repo/myfile3 b/test/integration/push/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/push/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/push/expected/repo/myfile4 b/test/integration/push/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/push/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/push/recording.json b/test/integration/push/recording.json deleted file mode 100644 index 62b3bfb86..000000000 --- a/test/integration/push/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":916,"Mod":0,"Key":256,"Ch":80},{"Timestamp":2131,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/push/setup.sh b/test/integration/push/setup.sh deleted file mode 100644 index ec135f72e..000000000 --- a/test/integration/push/setup.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e - -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 test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo origin - -cd repo - -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master diff --git a/test/integration/push/test.json b/test/integration/push/test.json deleted file mode 100644 index bcf197ae6..000000000 --- a/test/integration/push/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "push changes to the remote", "speed": 10 } diff --git a/test/integration/pushAndSetUpstream/expected/origin/HEAD b/test/integration/pushAndSetUpstream/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushAndSetUpstream/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushAndSetUpstream/expected/origin/config b/test/integration/pushAndSetUpstream/expected/origin/config deleted file mode 100644 index 18e379b43..000000000 --- a/test/integration/pushAndSetUpstream/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/pushAndSetUpstream/actual/./repo diff --git a/test/integration/pushAndSetUpstream/expected/origin/description b/test/integration/pushAndSetUpstream/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushAndSetUpstream/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushAndSetUpstream/expected/origin/info/exclude b/test/integration/pushAndSetUpstream/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushAndSetUpstream/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/pushAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 b/test/integration/pushAndSetUpstream/expected/origin/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 deleted file mode 100644 index dd4d890c2..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d b/test/integration/pushAndSetUpstream/expected/origin/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d deleted file mode 100644 index d8f35d219..000000000 --- a/test/integration/pushAndSetUpstream/expected/origin/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9Ed2?MADH,[J=ǷxZMCrv2k[`@qPX,Nbu_M!b0ԭ x)Py)Xz8zl|5E;ucT? *: \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/origin/packed-refs b/test/integration/pushAndSetUpstream/expected/origin/packed-refs deleted file mode 100644 index 7b481f224..000000000 --- a/test/integration/pushAndSetUpstream/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -978360cc5c0a9115bf3db5f10196cd135e1be962 refs/heads/master diff --git a/test/integration/pushAndSetUpstream/expected/origin/refs/heads/test b/test/integration/pushAndSetUpstream/expected/origin/refs/heads/test deleted file mode 100644 index 21ce8deb5..000000000 --- a/test/integration/pushAndSetUpstream/expected/origin/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 0ff8d1b7a..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -978360cc5c0a9115bf3db5f10196cd135e1be962 not-for-merge branch 'master' of ../origin diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/HEAD b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/HEAD deleted file mode 100644 index cea9d05ed..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/test diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/config b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/config deleted file mode 100644 index 2b6dd06c7..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[push] - default = nothing -[branch "test"] - remote = origin - merge = refs/heads/test diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/description b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushAndSetUpstream/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/pushAndSetUpstream/expected/repo/.git_keep/index b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/index deleted file mode 100644 index 701b9194f..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/info/exclude b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushAndSetUpstream/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/pushAndSetUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index b97dee17d..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 e0c356303c1b9b8fbe6acddb3e58f28b52348c60 CI 1648348273 +1100 commit (initial): myfile1 -e0c356303c1b9b8fbe6acddb3e58f28b52348c60 978360cc5c0a9115bf3db5f10196cd135e1be962 CI 1648348273 +1100 commit: myfile2 -978360cc5c0a9115bf3db5f10196cd135e1be962 eff34f9e6233e534513bb4b2154da4edd316283f CI 1648348273 +1100 commit: myfile3 -eff34f9e6233e534513bb4b2154da4edd316283f d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348273 +1100 commit: myfile4 -d77ec09ecf2391f9b76e54de98187095cd2edf9d d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348275 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 34ef6da51..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 e0c356303c1b9b8fbe6acddb3e58f28b52348c60 CI 1648348273 +1100 commit (initial): myfile1 -e0c356303c1b9b8fbe6acddb3e58f28b52348c60 978360cc5c0a9115bf3db5f10196cd135e1be962 CI 1648348273 +1100 commit: myfile2 -978360cc5c0a9115bf3db5f10196cd135e1be962 eff34f9e6233e534513bb4b2154da4edd316283f CI 1648348273 +1100 commit: myfile3 -eff34f9e6233e534513bb4b2154da4edd316283f d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348273 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/test deleted file mode 100644 index 9e9eedef1..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348275 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 75fe60b40..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 978360cc5c0a9115bf3db5f10196cd135e1be962 CI 1648348273 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/test deleted file mode 100644 index 53f60551f..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348276 +1100 update by push diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 deleted file mode 100644 index dd4d890c2..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d deleted file mode 100644 index d8f35d219..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9Ed2?MADH,[J=ǷxZMCrv2k[`@qPX,Nbu_M!b0ԭ x)Py)Xz8zl|5E;ucT? *: \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 21ce8deb5..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/test deleted file mode 100644 index 21ce8deb5..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 2539af585..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -978360cc5c0a9115bf3db5f10196cd135e1be962 diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/test deleted file mode 100644 index 21ce8deb5..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstream/expected/repo/myfile1 b/test/integration/pushAndSetUpstream/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pushAndSetUpstream/expected/repo/myfile2 b/test/integration/pushAndSetUpstream/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pushAndSetUpstream/expected/repo/myfile3 b/test/integration/pushAndSetUpstream/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pushAndSetUpstream/expected/repo/myfile4 b/test/integration/pushAndSetUpstream/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pushAndSetUpstream/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pushAndSetUpstream/recording.json b/test/integration/pushAndSetUpstream/recording.json deleted file mode 100644 index 6b209be21..000000000 --- a/test/integration/pushAndSetUpstream/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":519,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1101,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1286,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1382,"Mod":0,"Key":256,"Ch":101},{"Timestamp":1574,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1613,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1814,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2430,"Mod":0,"Key":256,"Ch":80},{"Timestamp":2910,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4149,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/setup.sh b/test/integration/pushAndSetUpstream/setup.sh deleted file mode 100644 index c4fa44969..000000000 --- a/test/integration/pushAndSetUpstream/setup.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e - -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 test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo origin - -cd repo - -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git remote add origin ../origin -git fetch origin -git config push.default nothing diff --git a/test/integration/pushAndSetUpstream/test.json b/test/integration/pushAndSetUpstream/test.json deleted file mode 100644 index f417f0ee5..000000000 --- a/test/integration/pushAndSetUpstream/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "push changes to the remote, setting upstream", "speed": 10 } diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/config b/test/integration/pushAndSetUpstreamDefault/expected/origin/config deleted file mode 100644 index b6cfc193d..000000000 --- a/test/integration/pushAndSetUpstreamDefault/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/pushAndSetUpstreamDefault/actual/./repo diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/description b/test/integration/pushAndSetUpstreamDefault/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/info/exclude b/test/integration/pushAndSetUpstreamDefault/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushAndSetUpstreamDefault/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/pushAndSetUpstreamDefault/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 deleted file mode 100644 index 7fbedd38e..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 deleted file mode 100644 index 60b6c9ee5..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e deleted file mode 100644 index 5bca7d1d2..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJ&N))1P!")#tyS5[ S`XzL%{puq8􈶭zK@&H\wg='MξeY4/, \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e deleted file mode 100644 index a80d7de45..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/packed-refs b/test/integration/pushAndSetUpstreamDefault/expected/origin/packed-refs deleted file mode 100644 index 2212696c5..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -309d64f4b30c8a17897642eb8966189d2b054af2 refs/heads/master diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/origin/refs/heads/test deleted file mode 100644 index 088420ba8..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/origin/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 088c0e840..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -309d64f4b30c8a17897642eb8966189d2b054af2 not-for-merge branch 'master' of ../origin diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/HEAD deleted file mode 100644 index cea9d05ed..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/config b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/config deleted file mode 100644 index 735b55597..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[push] - default = current -[branch "test"] - remote = origin - merge = refs/heads/test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/description b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushAndSetUpstreamDefault/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/pushAndSetUpstreamDefault/expected/repo/.git_keep/index b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/index deleted file mode 100644 index 6f272ffd6..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/info/exclude b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushAndSetUpstreamDefault/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/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 25cc9239c..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 8deea9ab6bed53871b952a62607704ea47d6d50e CI 1648348284 +1100 commit (initial): myfile1 -8deea9ab6bed53871b952a62607704ea47d6d50e 309d64f4b30c8a17897642eb8966189d2b054af2 CI 1648348284 +1100 commit: myfile2 -309d64f4b30c8a17897642eb8966189d2b054af2 a16265d00b218b3961405fc0c71a5ec2ffff879e CI 1648348284 +1100 commit: myfile3 -a16265d00b218b3961405fc0c71a5ec2ffff879e 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348284 +1100 commit: myfile4 -83d120ae6a09eeef4e082d1c2cc81aac81075988 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348287 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index cb73b1272..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 8deea9ab6bed53871b952a62607704ea47d6d50e CI 1648348284 +1100 commit (initial): myfile1 -8deea9ab6bed53871b952a62607704ea47d6d50e 309d64f4b30c8a17897642eb8966189d2b054af2 CI 1648348284 +1100 commit: myfile2 -309d64f4b30c8a17897642eb8966189d2b054af2 a16265d00b218b3961405fc0c71a5ec2ffff879e CI 1648348284 +1100 commit: myfile3 -a16265d00b218b3961405fc0c71a5ec2ffff879e 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348284 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/test deleted file mode 100644 index a3f63ea1c..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348287 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 3772cf2a7..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 309d64f4b30c8a17897642eb8966189d2b054af2 CI 1648348284 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/test deleted file mode 100644 index 30f2a7a42..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348288 +1100 update by push diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 deleted file mode 100644 index 7fbedd38e..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 deleted file mode 100644 index 60b6c9ee5..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e deleted file mode 100644 index 5bca7d1d2..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJ&N))1P!")#tyS5[ S`XzL%{puq8􈶭zK@&H\wg='MξeY4/, \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e deleted file mode 100644 index a80d7de45..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 088420ba8..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/test deleted file mode 100644 index 088420ba8..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 4415813b2..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -309d64f4b30c8a17897642eb8966189d2b054af2 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/test deleted file mode 100644 index 088420ba8..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile1 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile2 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile3 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile4 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pushAndSetUpstreamDefault/recording.json b/test/integration/pushAndSetUpstreamDefault/recording.json deleted file mode 100644 index f3e4e79b1..000000000 --- a/test/integration/pushAndSetUpstreamDefault/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1523,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1953,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2224,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2289,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2432,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2455,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2633,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3369,"Mod":0,"Key":256,"Ch":80},{"Timestamp":4464,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/setup.sh b/test/integration/pushAndSetUpstreamDefault/setup.sh deleted file mode 100644 index 04ec4d860..000000000 --- a/test/integration/pushAndSetUpstreamDefault/setup.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e - -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 test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo origin - -cd repo - -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git remote add origin ../origin -git fetch origin -git config push.default current diff --git a/test/integration/pushAndSetUpstreamDefault/test.json b/test/integration/pushAndSetUpstreamDefault/test.json deleted file mode 100644 index 5b9f43bd3..000000000 --- a/test/integration/pushAndSetUpstreamDefault/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "push changes to the remote, setting upstream automatically based on config", "speed": 10 } diff --git a/test/integration/pushFollowTags/expected/origin/HEAD b/test/integration/pushFollowTags/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushFollowTags/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushFollowTags/expected/origin/config b/test/integration/pushFollowTags/expected/origin/config deleted file mode 100644 index f285c4f51..000000000 --- a/test/integration/pushFollowTags/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/pushFollowTags/actual/./repo diff --git a/test/integration/pushFollowTags/expected/origin/description b/test/integration/pushFollowTags/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushFollowTags/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushFollowTags/expected/origin/info/exclude b/test/integration/pushFollowTags/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushFollowTags/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/pushFollowTags/expected/origin/objects/03/63748fdf3c7a6947886a53d51208c0866f76af b/test/integration/pushFollowTags/expected/origin/objects/03/63748fdf3c7a6947886a53d51208c0866f76af deleted file mode 100644 index d39af3410..000000000 --- a/test/integration/pushFollowTags/expected/origin/objects/03/63748fdf3c7a6947886a53d51208c0866f76af +++ /dev/null @@ -1,3 +0,0 @@ -x -0EW̾ Ig+?#/A7]9 Pw -YIrLٰc4kPrcN0 J?O7mQJ!{ھsYld'H \ No newline at end of file diff --git a/test/integration/pushFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 b/test/integration/pushFollowTags/expected/origin/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 deleted file mode 100644 index 500e00fd3..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 b/test/integration/pushFollowTags/expected/origin/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 deleted file mode 100644 index 16d65967d..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 b/test/integration/pushFollowTags/expected/origin/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 deleted file mode 100644 index 2c25bdee4..000000000 Binary files a/test/integration/pushFollowTags/expected/origin/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/origin/packed-refs b/test/integration/pushFollowTags/expected/origin/packed-refs deleted file mode 100644 index 00ae51cfc..000000000 --- a/test/integration/pushFollowTags/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 refs/heads/master diff --git a/test/integration/pushFollowTags/expected/origin/refs/heads/master b/test/integration/pushFollowTags/expected/origin/refs/heads/master deleted file mode 100644 index e3fe528b1..000000000 --- a/test/integration/pushFollowTags/expected/origin/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -8ac21a1d236ab7fb92c8f8082a98399596b59dd5 diff --git a/test/integration/pushFollowTags/expected/origin/refs/tags/v1.0 b/test/integration/pushFollowTags/expected/origin/refs/tags/v1.0 deleted file mode 100644 index 2a626e934..000000000 --- a/test/integration/pushFollowTags/expected/origin/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -0363748fdf3c7a6947886a53d51208c0866f76af diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pushFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index c23aa0355..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile3 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushFollowTags/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index bf5b60915..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 branch 'master' of ../origin diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/HEAD b/test/integration/pushFollowTags/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/config b/test/integration/pushFollowTags/expected/repo/.git_keep/config deleted file mode 100644 index fe5852494..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[push] - followTags = true diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/description b/test/integration/pushFollowTags/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushFollowTags/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/pushFollowTags/expected/repo/.git_keep/index b/test/integration/pushFollowTags/expected/repo/.git_keep/index deleted file mode 100644 index 9b5fc68b0..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/info/exclude b/test/integration/pushFollowTags/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushFollowTags/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/pushFollowTags/expected/repo/.git_keep/logs/HEAD b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index f9281a9c5..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 bc1bee0a92515554303f848cbdecb4f7bc219e55 CI 1648348306 +1100 commit (initial): myfile1 -bc1bee0a92515554303f848cbdecb4f7bc219e55 f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 CI 1648348306 +1100 commit: myfile2 -f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 8ac21a1d236ab7fb92c8f8082a98399596b59dd5 CI 1648348306 +1100 commit: myfile3 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index f9281a9c5..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 bc1bee0a92515554303f848cbdecb4f7bc219e55 CI 1648348306 +1100 commit (initial): myfile1 -bc1bee0a92515554303f848cbdecb4f7bc219e55 f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 CI 1648348306 +1100 commit: myfile2 -f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 8ac21a1d236ab7fb92c8f8082a98399596b59dd5 CI 1648348306 +1100 commit: myfile3 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index e9c2433a9..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 CI 1648348306 +1100 fetch origin: storing head -f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 8ac21a1d236ab7fb92c8f8082a98399596b59dd5 CI 1648348307 +1100 update by push diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/03/63748fdf3c7a6947886a53d51208c0866f76af b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/03/63748fdf3c7a6947886a53d51208c0866f76af deleted file mode 100644 index d39af3410..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/03/63748fdf3c7a6947886a53d51208c0866f76af +++ /dev/null @@ -1,3 +0,0 @@ -x -0EW̾ Ig+?#/A7]9 Pw -YIrLٰc4kPrcN0 J?O7mQJ!{ھsYld'H \ No newline at end of file diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 deleted file mode 100644 index 500e00fd3..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 deleted file mode 100644 index 16d65967d..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 deleted file mode 100644 index 2c25bdee4..000000000 Binary files a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/heads/master b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index e3fe528b1..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -8ac21a1d236ab7fb92c8f8082a98399596b59dd5 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index e3fe528b1..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -8ac21a1d236ab7fb92c8f8082a98399596b59dd5 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/tags/v1.0 b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/tags/v1.0 deleted file mode 100644 index 2a626e934..000000000 --- a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -0363748fdf3c7a6947886a53d51208c0866f76af diff --git a/test/integration/pushFollowTags/expected/repo/myfile1 b/test/integration/pushFollowTags/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pushFollowTags/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pushFollowTags/expected/repo/myfile2 b/test/integration/pushFollowTags/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pushFollowTags/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pushFollowTags/expected/repo/myfile3 b/test/integration/pushFollowTags/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pushFollowTags/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pushFollowTags/recording.json b/test/integration/pushFollowTags/recording.json deleted file mode 100644 index 43fd3fa5b..000000000 --- a/test/integration/pushFollowTags/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":682,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1641,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushFollowTags/setup.sh b/test/integration/pushFollowTags/setup.sh deleted file mode 100644 index d66aa5419..000000000 --- a/test/integration/pushFollowTags/setup.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -set -e - -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 test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo origin - -cd repo - -echo test3 > myfile3 -git add . -git commit -am "myfile3" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master -git config push.followTags true -git tag -a v1.0 -m "my version 1.0" diff --git a/test/integration/pushFollowTags/test.json b/test/integration/pushFollowTags/test.json deleted file mode 100644 index 1c8b13c9f..000000000 --- a/test/integration/pushFollowTags/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "push changes to the remote, when --follow-tags is configured", "speed": 10 } diff --git a/test/integration/pushNoFollowTags/expected/origin/HEAD b/test/integration/pushNoFollowTags/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushNoFollowTags/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushNoFollowTags/expected/origin/config b/test/integration/pushNoFollowTags/expected/origin/config deleted file mode 100644 index 67da24ff7..000000000 --- a/test/integration/pushNoFollowTags/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/pushNoFollowTags/actual/./repo diff --git a/test/integration/pushNoFollowTags/expected/origin/description b/test/integration/pushNoFollowTags/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushNoFollowTags/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushNoFollowTags/expected/origin/info/exclude b/test/integration/pushNoFollowTags/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushNoFollowTags/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/pushNoFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushNoFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushNoFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushNoFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae b/test/integration/pushNoFollowTags/expected/origin/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae deleted file mode 100644 index 60e20345f..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b b/test/integration/pushNoFollowTags/expected/origin/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b deleted file mode 100644 index db48eb1e2..000000000 --- a/test/integration/pushNoFollowTags/expected/origin/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] 2?iULg`l)oVZ=TUObR` [ku{:U q ;\Ac&.c;44ԋl03"kg֧ : \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushNoFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushNoFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushNoFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b b/test/integration/pushNoFollowTags/expected/origin/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b deleted file mode 100644 index c6e6187bd..000000000 Binary files a/test/integration/pushNoFollowTags/expected/origin/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/origin/packed-refs b/test/integration/pushNoFollowTags/expected/origin/packed-refs deleted file mode 100644 index 04e69c5bf..000000000 --- a/test/integration/pushNoFollowTags/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -f0ce9150789c4aef204270b5201d22e6f7e8b23b refs/heads/master diff --git a/test/integration/pushNoFollowTags/expected/origin/refs/heads/master b/test/integration/pushNoFollowTags/expected/origin/refs/heads/master deleted file mode 100644 index fc820b89f..000000000 --- a/test/integration/pushNoFollowTags/expected/origin/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pushNoFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index c23aa0355..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile3 diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushNoFollowTags/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 7f07f6234..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -f0ce9150789c4aef204270b5201d22e6f7e8b23b branch 'master' of ../origin diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/HEAD b/test/integration/pushNoFollowTags/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/config b/test/integration/pushNoFollowTags/expected/repo/.git_keep/config deleted file mode 100644 index 7721ae814..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/description b/test/integration/pushNoFollowTags/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushNoFollowTags/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/pushNoFollowTags/expected/repo/.git_keep/index b/test/integration/pushNoFollowTags/expected/repo/.git_keep/index deleted file mode 100644 index 1c3ab1418..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/info/exclude b/test/integration/pushNoFollowTags/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushNoFollowTags/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/pushNoFollowTags/expected/repo/.git_keep/logs/HEAD b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 36c5ad470..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 32a7825dd9144b755bd2bbefa9f0f75047d53aae CI 1648348314 +1100 commit (initial): myfile1 -32a7825dd9144b755bd2bbefa9f0f75047d53aae f0ce9150789c4aef204270b5201d22e6f7e8b23b CI 1648348314 +1100 commit: myfile2 -f0ce9150789c4aef204270b5201d22e6f7e8b23b 4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b CI 1648348314 +1100 commit: myfile3 diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 36c5ad470..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 32a7825dd9144b755bd2bbefa9f0f75047d53aae CI 1648348314 +1100 commit (initial): myfile1 -32a7825dd9144b755bd2bbefa9f0f75047d53aae f0ce9150789c4aef204270b5201d22e6f7e8b23b CI 1648348314 +1100 commit: myfile2 -f0ce9150789c4aef204270b5201d22e6f7e8b23b 4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b CI 1648348314 +1100 commit: myfile3 diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 2ef4175f7..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f0ce9150789c4aef204270b5201d22e6f7e8b23b CI 1648348314 +1100 fetch origin: storing head -f0ce9150789c4aef204270b5201d22e6f7e8b23b 4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b CI 1648348315 +1100 update by push diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae deleted file mode 100644 index 60e20345f..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b deleted file mode 100644 index db48eb1e2..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] 2?iULg`l)oVZ=TUObR` [ku{:U q ;\Ac&.c;44ԋl03"kg֧ : \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/bc/74fd77b84a00637ff1a30dc835d7d9d48e5e16 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/bc/74fd77b84a00637ff1a30dc835d7d9d48e5e16 deleted file mode 100644 index 18b8870a4..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/bc/74fd77b84a00637ff1a30dc835d7d9d48e5e16 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E)f_J)8Kcox~P{d~K(`bZwlٻ02b݌FfUU Jة&٠/~Qt.w ,(J \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b deleted file mode 100644 index c6e6187bd..000000000 Binary files a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/heads/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index fc820b89f..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index fc820b89f..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/tags/v1.0 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/tags/v1.0 deleted file mode 100644 index ac64fbcb2..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -bc74fd77b84a00637ff1a30dc835d7d9d48e5e16 diff --git a/test/integration/pushNoFollowTags/expected/repo/myfile1 b/test/integration/pushNoFollowTags/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pushNoFollowTags/expected/repo/myfile2 b/test/integration/pushNoFollowTags/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pushNoFollowTags/expected/repo/myfile3 b/test/integration/pushNoFollowTags/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pushNoFollowTags/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pushNoFollowTags/recording.json b/test/integration/pushNoFollowTags/recording.json deleted file mode 100644 index 428f83f07..000000000 --- a/test/integration/pushNoFollowTags/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":636,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1563,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/setup.sh b/test/integration/pushNoFollowTags/setup.sh deleted file mode 100644 index f8c704295..000000000 --- a/test/integration/pushNoFollowTags/setup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -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 test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo origin - -cd repo - -echo test3 > myfile3 -git add . -git commit -am "myfile3" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master -git tag -a v1.0 -m "my version 1.0" diff --git a/test/integration/pushNoFollowTags/test.json b/test/integration/pushNoFollowTags/test.json deleted file mode 100644 index 65f6b3409..000000000 --- a/test/integration/pushNoFollowTags/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "push changes to the remote, when --follow-tags is not configured", "speed": 10 } diff --git a/test/integration/pushTag/expected/origin/HEAD b/test/integration/pushTag/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushTag/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushTag/expected/origin/config b/test/integration/pushTag/expected/origin/config deleted file mode 100644 index 322981408..000000000 --- a/test/integration/pushTag/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/pushTag/actual/./repo diff --git a/test/integration/pushTag/expected/origin/description b/test/integration/pushTag/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushTag/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushTag/expected/origin/info/exclude b/test/integration/pushTag/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushTag/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/pushTag/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushTag/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushTag/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushTag/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushTag/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushTag/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushTag/expected/origin/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 b/test/integration/pushTag/expected/origin/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 deleted file mode 100644 index e3bebf789..000000000 Binary files a/test/integration/pushTag/expected/origin/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 and /dev/null differ diff --git a/test/integration/pushTag/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushTag/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushTag/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushTag/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushTag/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushTag/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushTag/expected/origin/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 b/test/integration/pushTag/expected/origin/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 deleted file mode 100644 index 667d1eb35..000000000 --- a/test/integration/pushTag/expected/origin/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] ԀU3Xhl)[<⛶R!>wĐc0Ϫ$$"3 W;T(<*)H4s5䲯zr |6 l;Uܕ-9 \ No newline at end of file diff --git a/test/integration/pushTag/expected/origin/packed-refs b/test/integration/pushTag/expected/origin/packed-refs deleted file mode 100644 index 97e7bbf20..000000000 --- a/test/integration/pushTag/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -f4d17a0fe9700c664eb4227b5992a4117c481eb4 refs/heads/master diff --git a/test/integration/pushTag/expected/origin/refs/tags/v1.0 b/test/integration/pushTag/expected/origin/refs/tags/v1.0 deleted file mode 100644 index 4e9f606c9..000000000 --- a/test/integration/pushTag/expected/origin/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushTag/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pushTag/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index f4b7a0e26..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile2 diff --git a/test/integration/pushTag/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushTag/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 073a60063..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -f4d17a0fe9700c664eb4227b5992a4117c481eb4 branch 'master' of ../origin diff --git a/test/integration/pushTag/expected/repo/.git_keep/HEAD b/test/integration/pushTag/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushTag/expected/repo/.git_keep/config b/test/integration/pushTag/expected/repo/.git_keep/config deleted file mode 100644 index 7721ae814..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/pushTag/expected/repo/.git_keep/description b/test/integration/pushTag/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushTag/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/pushTag/expected/repo/.git_keep/index b/test/integration/pushTag/expected/repo/.git_keep/index deleted file mode 100644 index 318501c8d..000000000 Binary files a/test/integration/pushTag/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pushTag/expected/repo/.git_keep/info/exclude b/test/integration/pushTag/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushTag/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/pushTag/expected/repo/.git_keep/logs/HEAD b/test/integration/pushTag/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 66ae6fb77..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a472e4256e0cabe433e1655f13d45f5093f502f3 CI 1648348327 +1100 commit (initial): myfile1 -a472e4256e0cabe433e1655f13d45f5093f502f3 f4d17a0fe9700c664eb4227b5992a4117c481eb4 CI 1648348327 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushTag/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 66ae6fb77..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a472e4256e0cabe433e1655f13d45f5093f502f3 CI 1648348327 +1100 commit (initial): myfile1 -a472e4256e0cabe433e1655f13d45f5093f502f3 f4d17a0fe9700c664eb4227b5992a4117c481eb4 CI 1648348327 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushTag/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 1e8c40120..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f4d17a0fe9700c664eb4227b5992a4117c481eb4 CI 1648348327 +1100 fetch origin: storing head diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushTag/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushTag/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushTag/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushTag/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 b/test/integration/pushTag/expected/repo/.git_keep/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 deleted file mode 100644 index e3bebf789..000000000 Binary files a/test/integration/pushTag/expected/repo/.git_keep/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 and /dev/null differ diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushTag/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushTag/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushTag/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushTag/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 b/test/integration/pushTag/expected/repo/.git_keep/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 deleted file mode 100644 index 667d1eb35..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] ԀU3Xhl)[<⛶R!>wĐc0Ϫ$$"3 W;T(<*)H4s5䲯zr |6 l;Uܕ-9 \ No newline at end of file diff --git a/test/integration/pushTag/expected/repo/.git_keep/refs/heads/master b/test/integration/pushTag/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 4e9f606c9..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushTag/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushTag/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 4e9f606c9..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushTag/expected/repo/.git_keep/refs/tags/v1.0 b/test/integration/pushTag/expected/repo/.git_keep/refs/tags/v1.0 deleted file mode 100644 index 4e9f606c9..000000000 --- a/test/integration/pushTag/expected/repo/.git_keep/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushTag/expected/repo/myfile1 b/test/integration/pushTag/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pushTag/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pushTag/expected/repo/myfile2 b/test/integration/pushTag/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pushTag/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pushTag/recording.json b/test/integration/pushTag/recording.json deleted file mode 100644 index 91490d1f6..000000000 --- a/test/integration/pushTag/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":736,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1398,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1526,"Mod":0,"Key":256,"Ch":93},{"Timestamp":2271,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2759,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3342,"Mod":0,"Key":256,"Ch":118},{"Timestamp":3655,"Mod":0,"Key":256,"Ch":49},{"Timestamp":3792,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3958,"Mod":0,"Key":256,"Ch":48},{"Timestamp":4271,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5062,"Mod":0,"Key":256,"Ch":80},{"Timestamp":5487,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6455,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushTag/setup.sh b/test/integration/pushTag/setup.sh deleted file mode 100644 index beedd6ad7..000000000 --- a/test/integration/pushTag/setup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -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 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 diff --git a/test/integration/pushTag/test.json b/test/integration/pushTag/test.json deleted file mode 100644 index 2e194536b..000000000 --- a/test/integration/pushTag/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "create and push tag to remote", "speed": 10 } diff --git a/test/integration/pushWithCredentials/expected/origin/HEAD b/test/integration/pushWithCredentials/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushWithCredentials/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushWithCredentials/expected/origin/config b/test/integration/pushWithCredentials/expected/origin/config deleted file mode 100644 index 97d87029a..000000000 --- a/test/integration/pushWithCredentials/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/pushWithCredentials/actual/./repo diff --git a/test/integration/pushWithCredentials/expected/origin/description b/test/integration/pushWithCredentials/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushWithCredentials/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushWithCredentials/expected/origin/info/exclude b/test/integration/pushWithCredentials/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushWithCredentials/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/pushWithCredentials/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushWithCredentials/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushWithCredentials/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushWithCredentials/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushWithCredentials/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 b/test/integration/pushWithCredentials/expected/origin/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 deleted file mode 100644 index 9a7993c8a..000000000 --- a/test/integration/pushWithCredentials/expected/origin/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E] 2I"BW=F2BcK7GpV,^"eE=&O iqbtȫِcHI!P0s9#+nԱoWؤw{nf{|RWVw'3"m?Oԯ.:W \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected/origin/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc b/test/integration/pushWithCredentials/expected/origin/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc deleted file mode 100644 index 7ac5bf63c..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c b/test/integration/pushWithCredentials/expected/origin/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c deleted file mode 100644 index efbdd8e6b..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushWithCredentials/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushWithCredentials/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 b/test/integration/pushWithCredentials/expected/origin/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 deleted file mode 100644 index a711ed381..000000000 --- a/test/integration/pushWithCredentials/expected/origin/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9d&Dz4`R"~◵&>]\ lhbEPL^4c%f˻:&t%TBqjwk UNQPL~Ǻ0um{ꥬ(pF'7[F8 \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushWithCredentials/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushWithCredentials/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushWithCredentials/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/origin/packed-refs b/test/integration/pushWithCredentials/expected/origin/packed-refs deleted file mode 100644 index a8749c608..000000000 --- a/test/integration/pushWithCredentials/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -5b85aaf0806d1bc5830bb10291727f773c3402dc refs/heads/master diff --git a/test/integration/pushWithCredentials/expected/origin/refs/heads/master b/test/integration/pushWithCredentials/expected/origin/refs/heads/master deleted file mode 100644 index 12e3ae0c7..000000000 --- a/test/integration/pushWithCredentials/expected/origin/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d108cb97213835c25d44e14d167e7c5b48f94ce2 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pushWithCredentials/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushWithCredentials/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index bfa52698e..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -5b85aaf0806d1bc5830bb10291727f773c3402dc branch 'master' of ../origin diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/HEAD b/test/integration/pushWithCredentials/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/config b/test/integration/pushWithCredentials/expected/repo/.git_keep/config deleted file mode 100644 index 7721ae814..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/description b/test/integration/pushWithCredentials/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pushWithCredentials/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/pushWithCredentials/expected/repo/.git_keep/index b/test/integration/pushWithCredentials/expected/repo/.git_keep/index deleted file mode 100644 index 0c9add5d7..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/info/exclude b/test/integration/pushWithCredentials/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pushWithCredentials/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/pushWithCredentials/expected/repo/.git_keep/logs/HEAD b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 238148235..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 5d98350a913b48a35001ff9b54335f065b25fd7c CI 1648348611 +1100 commit (initial): myfile1 -5d98350a913b48a35001ff9b54335f065b25fd7c 5b85aaf0806d1bc5830bb10291727f773c3402dc CI 1648348611 +1100 commit: myfile2 -5b85aaf0806d1bc5830bb10291727f773c3402dc 3e912c74bc7c237df0c521aff7b3f4932d7e8616 CI 1648348611 +1100 commit: myfile3 -3e912c74bc7c237df0c521aff7b3f4932d7e8616 d108cb97213835c25d44e14d167e7c5b48f94ce2 CI 1648348611 +1100 commit: myfile4 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 238148235..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 5d98350a913b48a35001ff9b54335f065b25fd7c CI 1648348611 +1100 commit (initial): myfile1 -5d98350a913b48a35001ff9b54335f065b25fd7c 5b85aaf0806d1bc5830bb10291727f773c3402dc CI 1648348611 +1100 commit: myfile2 -5b85aaf0806d1bc5830bb10291727f773c3402dc 3e912c74bc7c237df0c521aff7b3f4932d7e8616 CI 1648348611 +1100 commit: myfile3 -3e912c74bc7c237df0c521aff7b3f4932d7e8616 d108cb97213835c25d44e14d167e7c5b48f94ce2 CI 1648348611 +1100 commit: myfile4 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index a55b9f3a9..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 5b85aaf0806d1bc5830bb10291727f773c3402dc CI 1648348611 +1100 fetch origin: storing head -5b85aaf0806d1bc5830bb10291727f773c3402dc d108cb97213835c25d44e14d167e7c5b48f94ce2 CI 1648348616 +1100 update by push diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 deleted file mode 100644 index 9a7993c8a..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E] 2I"BW=F2BcK7GpV,^"eE=&O iqbtȫِcHI!P0s9#+nԱoWؤw{nf{|RWVw'3"m?Oԯ.:W \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc deleted file mode 100644 index 7ac5bf63c..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c deleted file mode 100644 index efbdd8e6b..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 deleted file mode 100644 index a711ed381..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9d&Dz4`R"~◵&>]\ lhbEPL^4c%f˻:&t%TBqjwk UNQPL~Ǻ0um{ꥬ(pF'7[F8 \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/heads/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 12e3ae0c7..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d108cb97213835c25d44e14d167e7c5b48f94ce2 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 12e3ae0c7..000000000 --- a/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -d108cb97213835c25d44e14d167e7c5b48f94ce2 diff --git a/test/integration/pushWithCredentials/expected/repo/myfile1 b/test/integration/pushWithCredentials/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pushWithCredentials/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pushWithCredentials/expected/repo/myfile2 b/test/integration/pushWithCredentials/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pushWithCredentials/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pushWithCredentials/expected/repo/myfile3 b/test/integration/pushWithCredentials/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pushWithCredentials/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pushWithCredentials/expected/repo/myfile4 b/test/integration/pushWithCredentials/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pushWithCredentials/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pushWithCredentials/recording.json b/test/integration/pushWithCredentials/recording.json deleted file mode 100644 index 961945fef..000000000 --- a/test/integration/pushWithCredentials/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":522,"Mod":0,"Key":256,"Ch":80},{"Timestamp":2106,"Mod":0,"Key":256,"Ch":117},{"Timestamp":2210,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2362,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2386,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2474,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2554,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2643,"Mod":0,"Key":256,"Ch":109},{"Timestamp":2706,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2850,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3722,"Mod":0,"Key":256,"Ch":112},{"Timestamp":3787,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3858,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3987,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4131,"Mod":0,"Key":256,"Ch":119},{"Timestamp":4250,"Mod":0,"Key":256,"Ch":111},{"Timestamp":4313,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4433,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4594,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8227,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushWithCredentials/setup.sh b/test/integration/pushWithCredentials/setup.sh deleted file mode 100644 index c3fccb5da..000000000 --- a/test/integration/pushWithCredentials/setup.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -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 test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo origin - -cd repo - -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -# actually getting a password prompt is tricky: it requires SSH'ing into localhost under a newly created, restricted, user. This is not easy to do in a cross-platform way, nor is it easy to do in a docker container. If you can think of a way to do it, please let me know! -cp ../../../../hooks/pre-push .git/hooks/pre-push -chmod +x .git/hooks/pre-push diff --git a/test/integration/pushWithCredentials/test.json b/test/integration/pushWithCredentials/test.json deleted file mode 100644 index 2e3b4aedd..000000000 --- a/test/integration/pushWithCredentials/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "push changes to the remote, with a password prompt", - "speed": 10 -}