diff --git a/pkg/integration/tests/conflicts/filter.go b/pkg/integration/tests/conflicts/filter.go new file mode 100644 index 000000000..b5f4b4c81 --- /dev/null +++ b/pkg/integration/tests/conflicts/filter.go @@ -0,0 +1,38 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var Filter = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Ensures that when there are merge conflicts, the files panel only shows conflicted files", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeConflictFiles(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file1").IsSelected(), + Contains("UU").Contains("file2"), + ). + Press(keys.Files.OpenStatusFilter). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Filtering")). + Select(Contains("Reset filter")). + Confirm() + }). + Lines( + Contains("UU").Contains("file1").IsSelected(), + Contains("UU").Contains("file2"), + // now we see the non-merge conflict file + Contains("A ").Contains("file3"), + ) + }, +}) diff --git a/pkg/integration/tests/conflicts/resolve_externally.go b/pkg/integration/tests/conflicts/resolve_externally.go new file mode 100644 index 000000000..385e9ce4a --- /dev/null +++ b/pkg/integration/tests/conflicts/resolve_externally.go @@ -0,0 +1,33 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var ResolveExternally = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Ensures that when merge conflicts are resolved outside of lazygit, lazygit prompts you to continue", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeConflictFile(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + Tap(func() { + t.Shell().UpdateFile("file", "resolved content") + }). + Press(keys.Universal.Refresh) + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Files(). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/conflicts/resolve_multiple_files.go b/pkg/integration/tests/conflicts/resolve_multiple_files.go new file mode 100644 index 000000000..2be35148e --- /dev/null +++ b/pkg/integration/tests/conflicts/resolve_multiple_files.go @@ -0,0 +1,54 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Ensures that upon resolving conflicts for one file, the next file is selected", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeConflictFiles(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file1").IsSelected(), + Contains("UU").Contains("file2"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + SelectedLines( + Contains("<<<<<<< HEAD"), + Contains("First Change"), + Contains("======="), + ). + PressPrimaryAction() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file2").IsSelected(), + ). + PressEnter() + + // coincidentally these files have the same conflict + t.Views().MergeConflicts(). + IsFocused(). + SelectedLines( + Contains("<<<<<<< HEAD"), + Contains("First Change"), + Contains("======="), + ). + PressPrimaryAction() + + t.Actions().ContinueOnConflictsResolved() + }, +}) diff --git a/pkg/integration/tests/shared/conflicts.go b/pkg/integration/tests/shared/conflicts.go index 39a37cc37..76800a878 100644 --- a/pkg/integration/tests/shared/conflicts.go +++ b/pkg/integration/tests/shared/conflicts.go @@ -60,6 +60,33 @@ var CreateMergeCommit = func(shell *Shell) { shell.ContinueMerge() } +// creates a merge conflict where there are two files with conflicts and a separate file without conflicts +var CreateMergeConflictFiles = func(shell *Shell) { + shell. + NewBranch("original-branch"). + EmptyCommit("one"). + EmptyCommit("two"). + EmptyCommit("three"). + CreateFileAndAdd("file1", OriginalFileContent). + CreateFileAndAdd("file2", OriginalFileContent). + Commit("original"). + NewBranch("first-change-branch"). + UpdateFileAndAdd("file1", FirstChangeFileContent). + UpdateFileAndAdd("file2", FirstChangeFileContent). + Commit("first change"). + Checkout("original-branch"). + NewBranch("second-change-branch"). + UpdateFileAndAdd("file1", SecondChangeFileContent). + UpdateFileAndAdd("file2", SecondChangeFileContent). + // this file is not changed in the second branch + CreateFileAndAdd("file3", "content"). + Commit("second change"). + EmptyCommit("second-change-branch unrelated change"). + Checkout("first-change-branch") + + shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") +} + // These 'multiple' variants are just like the short ones but with longer file contents and with multiple conflicts within the file. var OriginalFileContentMultiple = ` @@ -110,8 +137,7 @@ Other Other Second Change ` -// prepares us for a rebase/merge that has conflicts -var MergeConflictsSetupMultiple = func(shell *Shell) { +var CreateMergeConflictFileMultiple = func(shell *Shell) { shell. NewBranch("original-branch"). EmptyCommit("one"). @@ -128,16 +154,6 @@ var MergeConflictsSetupMultiple = func(shell *Shell) { Commit("second change"). EmptyCommit("second-change-branch unrelated change"). Checkout("first-change-branch") -} - -var CreateMergeConflictFileMultiple = func(shell *Shell) { - MergeConflictsSetupMultiple(shell) shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") } - -var CreateMergeCommitMultiple = func(shell *Shell) { - CreateMergeConflictFileMultiple(shell) - shell.UpdateFileAndAdd("file", SecondChangeFileContentMultiple) - shell.ContinueMerge() -} diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 16cf7d92a..dd1dfd70f 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -59,6 +59,9 @@ var tests = []*components.IntegrationTest{ commit.StagedWithoutHooks, commit.Unstaged, config.RemoteNamedStar, + conflicts.Filter, + conflicts.ResolveExternally, + conflicts.ResolveMultipleFiles, conflicts.UndoChooseHunk, custom_commands.Basic, custom_commands.FormPrompts, diff --git a/test/integration/mergeConflicts/config/config.yml b/test/integration/mergeConflicts/config/config.yml deleted file mode 100644 index 718ebf70d..000000000 --- a/test/integration/mergeConflicts/config/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -disableStartupPopups: true -gui: - showFileTree: false -refresher: - refreshInterval: 1 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index b41fd4b11..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,36 +0,0 @@ -Merge branch 'develop' into other_branch - -# Conflicts: -# directory/file -# directory/file2 -# file1 -# file3 -# file4 -# file5 -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflicts/actual/.git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch other_branch -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# new file: cherrypicking1 -# new file: cherrypicking2 -# new file: cherrypicking3 -# new file: cherrypicking4 -# new file: cherrypicking5 -# new file: cherrypicking6 -# new file: cherrypicking7 -# new file: cherrypicking8 -# new file: cherrypicking9 -# modified: file1 -# modified: file4 -# modified: file5 -# diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/HEAD deleted file mode 100644 index 904a2e296..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other_branch diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index c7c35a1e7..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -562af0640203fb5a6e92c090d8d1ded26806d2c4 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/config b/test/integration/mergeConflicts/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/description b/test/integration/mergeConflicts/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflicts/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/mergeConflicts/expected/repo/.git_keep/index b/test/integration/mergeConflicts/expected/repo/.git_keep/index deleted file mode 100644 index 4e5ae2746..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflicts/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/mergeConflicts/expected/repo/.git_keep/logs/HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 6ebcd55da..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,34 +0,0 @@ -0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 commit (initial): first commit -1618ce1085acb41fd710e279ac38911aadfb0a09 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 checkout: moving from master to feature/cherry-picking -1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI 1617671441 +1000 commit: first commit freshman year -b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI 1617671441 +1000 commit: second commit subway eat fresh -f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI 1617671441 +1000 commit: third commit fresh -edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI 1617671441 +1000 commit: fourth commit cool -cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI 1617671441 +1000 commit: fifth commit nice -b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI 1617671441 +1000 commit: sixth commit haha -df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI 1617671441 +1000 commit: seventh commit yeah -1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 commit: eighth commit woo -d3e2708327280097b5e1f8ab69309934b24f8b64 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 checkout: moving from feature/cherry-picking to develop -d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 commit: first commit on develop -a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 checkout: moving from develop to master -1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 commit: first commit on master -f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 checkout: moving from master to develop -a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 commit: second commit on develop -55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 checkout: moving from develop to master -f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 commit: second commit on master -a19ec0b99e516795f349033f09383f87be0b74e9 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 checkout: moving from master to develop -55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 commit: third commit on develop -dd259e90c3748e269bdf1ee3ce537a006d2394aa a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 checkout: moving from develop to master -a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 commit: third commit on master -61db24350a92fa37b2fe35f13eb3dd3f7655f6cf dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 checkout: moving from master to develop -dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI 1617671441 +1000 commit: fourth commit on develop -e563585cb87cc39b553ca421902d631ea8890118 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 checkout: moving from develop to master -61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 commit: fourth commit on master -559043765dc6c32c943b6278b4abbff1e6f52839 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 checkout: moving from master to base_branch -559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 commit: file -0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from base_branch to other_branch -0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from other_branch to base_branch -0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI 1617671441 +1000 commit: file changed -341cf8213827614a274c750cd7dec4307eb41de7 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from base_branch to other_branch -0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI 1617671444 +1000 commit: asd -562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch deleted file mode 100644 index 6e46aa010..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 branch: Created from HEAD -559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 commit: file -0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI 1617671441 +1000 commit: file changed diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 83fe584c1..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 branch: Created from HEAD -d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 commit: first commit on develop -a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 commit: second commit on develop -55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 commit: third commit on develop -dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI 1617671441 +1000 commit: fourth commit on develop diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking deleted file mode 100644 index f90ef71fb..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 branch: Created from HEAD -1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI 1617671441 +1000 commit: first commit freshman year -b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI 1617671441 +1000 commit: second commit subway eat fresh -f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI 1617671441 +1000 commit: third commit fresh -edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI 1617671441 +1000 commit: fourth commit cool -cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI 1617671441 +1000 commit: fifth commit nice -b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI 1617671441 +1000 commit: sixth commit haha -df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI 1617671441 +1000 commit: seventh commit yeah -1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 commit: eighth commit woo diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 3ac4fad17..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 commit (initial): first commit -1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 commit: first commit on master -f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 commit: second commit on master -a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 commit: third commit on master -61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 commit: fourth commit on master diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index cb2cf3437..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 branch: Created from HEAD -0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI 1617671444 +1000 commit: asd -562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 deleted file mode 100644 index 5c37019a9..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 deleted file mode 100644 index d75634d71..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 deleted file mode 100644 index 25389c9d6..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c deleted file mode 100644 index fd879a5f3..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 deleted file mode 100644 index 9b8af5fe7..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d1..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 deleted file mode 100644 index 99413297c..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 +++ /dev/null @@ -1,4 +0,0 @@ -xM -0F]d&͏cPR xŰ*,g>Ӟ -MGΌX; -RlFav(91tRCN9~i`4} (?UϹy諵Lo\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 deleted file mode 100644 index 923f56302..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 deleted file mode 100644 index e0670d284..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 +++ /dev/null @@ -1 +0,0 @@ -x 0CvL\jVОW=Mu^=jq|@kΨV=:9WRWiP_P} mA \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 deleted file mode 100644 index cd691a15d..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 +++ /dev/null @@ -1,6 +0,0 @@ -xA -0E]d&S -"BW=F&3EmJ x>/eyTDLR4`2wG1Tz>dĈmiB"C"10Er䅣 0eoI6) -(#8"F[T?i -? -jo^B \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 deleted file mode 100644 index 785d58c4c..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 deleted file mode 100644 index 9633a4077..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 deleted file mode 100644 index aafb5da95..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 deleted file mode 100644 index 27ac61738..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 deleted file mode 100644 index bfb5376c6..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 deleted file mode 100644 index 236b6cdf4..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf deleted file mode 100644 index 744a40a57..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf +++ /dev/null @@ -1,2 +0,0 @@ -xM -0a9i&?"BW=FNhR#x| ^7. :SUS 轋(0zǒ8ZT̖v}6H$:bQG>+-xp[bȊ9I6;\ᮟT^Ƶހ<Lh8ܴy')XP > \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 deleted file mode 100644 index c41ae5c62..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d deleted file mode 100644 index d63de558b..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 deleted file mode 100644 index ea7fa5303..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd deleted file mode 100644 index cdd5f8a93..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e deleted file mode 100644 index cc06d0590..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c deleted file mode 100644 index 1befd67ac..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 deleted file mode 100644 index 5a18068af..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0]di"BW=$`F>ދgv@h,و 9k f${BqrSR6ΣC$6yMIfO:8ۣ0/p|l/Zn@lG3!괟jg]A]mPA# \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b deleted file mode 100644 index f93dc352f..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b +++ /dev/null @@ -1,4 +0,0 @@ -xK -0@]d&| -"BW=FL6F{R]&<]49x L)JbF<Ǚ66F` -0F:Qs ѱ_Qw]>rIu93Qjʴ?*+dy\7> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c deleted file mode 100644 index 7302ca34e..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 deleted file mode 100644 index 1ab3c4866..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a deleted file mode 100644 index 03daf0b70..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a +++ /dev/null @@ -1,3 +0,0 @@ -x -0E]+f/H&}U?c2cKAފ?r\qu( UAc]PAjCD֬(5 -Y4xcDccb;#2-.pKzIt6al5*7q[E1c< ;C| \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 deleted file mode 100644 index 4aa46eb8c..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 deleted file mode 100644 index 008bb1a65..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 deleted file mode 100644 index 58dd790dc..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 deleted file mode 100644 index ab357ec23..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 deleted file mode 100644 index 139da07d2..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]$I"BW=F2NmR"z| ^{[Kݡo"%̥LlbdԚ7yv -">Y p9&_}n #*\ׇ a!Qku?O\r ? ޭ/Ճ=w \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 deleted file mode 100644 index 198bff1ec..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 deleted file mode 100644 index af687b620..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c +++ /dev/null @@ -1 +0,0 @@ -x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa deleted file mode 100644 index f66748219..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]d&i@DcL -XSJ>ރWں.,敖BX'aRgb=˾:LS1Bà1{,PkjCf.$5Zks@gxx[ P$L ͗~>/ -&}m@; \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 deleted file mode 100644 index 0e14fe828..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e deleted file mode 100644 index 3a7ee91ea..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 deleted file mode 100644 index 714e20cb7..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 deleted file mode 100644 index 83998943a..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 deleted file mode 100644 index 0c4f12bc5..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 +++ /dev/null @@ -1,2 +0,0 @@ -xM - F/G?PJ!C )Ĕ^_:(Ko1&OfeeҺ Hȋ'+τӱ'OڿrO[YTຍm,?>R \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 deleted file mode 100644 index 168b5c5f9..000000000 Binary files a/test/integration/mergeConflicts/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch deleted file mode 100644 index 50316367d..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch +++ /dev/null @@ -1 +0,0 @@ -341cf8213827614a274c750cd7dec4307eb41de7 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index ffaafc687..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -e563585cb87cc39b553ca421902d631ea8890118 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking deleted file mode 100644 index 848e686fb..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking +++ /dev/null @@ -1 +0,0 @@ -d3e2708327280097b5e1f8ab69309934b24f8b64 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 7874adebd..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -559043765dc6c32c943b6278b4abbff1e6f52839 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index 1e2bd76fa..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -f8dd12b796f400be7f59d9471670c3080f9c90a1 diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking1 b/test/integration/mergeConflicts/expected/repo/cherrypicking1 deleted file mode 100644 index 6101e9354..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking1 +++ /dev/null @@ -1 +0,0 @@ -this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking2 b/test/integration/mergeConflicts/expected/repo/cherrypicking2 deleted file mode 100644 index 889b0fdfe..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking2 +++ /dev/null @@ -1 +0,0 @@ -this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking3 b/test/integration/mergeConflicts/expected/repo/cherrypicking3 deleted file mode 100644 index eb90e8d7b..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking3 +++ /dev/null @@ -1 +0,0 @@ -this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking4 b/test/integration/mergeConflicts/expected/repo/cherrypicking4 deleted file mode 100644 index b4121e2d6..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking4 +++ /dev/null @@ -1 +0,0 @@ -this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking5 b/test/integration/mergeConflicts/expected/repo/cherrypicking5 deleted file mode 100644 index afa76754c..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking5 +++ /dev/null @@ -1 +0,0 @@ -this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking6 b/test/integration/mergeConflicts/expected/repo/cherrypicking6 deleted file mode 100644 index 18f469bc7..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking6 +++ /dev/null @@ -1 +0,0 @@ -this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking7 b/test/integration/mergeConflicts/expected/repo/cherrypicking7 deleted file mode 100644 index e448ae5bf..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking7 +++ /dev/null @@ -1 +0,0 @@ -this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking8 b/test/integration/mergeConflicts/expected/repo/cherrypicking8 deleted file mode 100644 index 90a84fd62..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking8 +++ /dev/null @@ -1 +0,0 @@ -this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking9 b/test/integration/mergeConflicts/expected/repo/cherrypicking9 deleted file mode 100644 index 22b0fd807..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking9 +++ /dev/null @@ -1 +0,0 @@ -this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflicts/expected/repo/directory/file b/test/integration/mergeConflicts/expected/repo/directory/file deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/mergeConflicts/expected/repo/directory/file +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/mergeConflicts/expected/repo/directory/file2 b/test/integration/mergeConflicts/expected/repo/directory/file2 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/mergeConflicts/expected/repo/directory/file2 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/mergeConflicts/expected/repo/file b/test/integration/mergeConflicts/expected/repo/file deleted file mode 100644 index 2410ee12b..000000000 --- a/test/integration/mergeConflicts/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -new2\noriginal2\noriginal3 diff --git a/test/integration/mergeConflicts/expected/repo/file1 b/test/integration/mergeConflicts/expected/repo/file1 deleted file mode 100644 index 5d874a902..000000000 --- a/test/integration/mergeConflicts/expected/repo/file1 +++ /dev/null @@ -1,63 +0,0 @@ -Here is a story that has been told throuhg the ages -once upon a time there was a cat -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another dog diff --git a/test/integration/mergeConflicts/expected/repo/file3 b/test/integration/mergeConflicts/expected/repo/file3 deleted file mode 100644 index e3ae5c6d8..000000000 --- a/test/integration/mergeConflicts/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a horse diff --git a/test/integration/mergeConflicts/expected/repo/file4 b/test/integration/mergeConflicts/expected/repo/file4 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/mergeConflicts/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/mergeConflicts/expected/repo/file5 b/test/integration/mergeConflicts/expected/repo/file5 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/mergeConflicts/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/mergeConflicts/recording.json b/test/integration/mergeConflicts/recording.json deleted file mode 100644 index 52b825301..000000000 --- a/test/integration/mergeConflicts/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1126,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1332,"Mod":0,"Key":256,"Ch":99},{"Timestamp":1621,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1677,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1758,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1990,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2286,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2557,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2805,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2957,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3541,"Mod":0,"Key":256,"Ch":77},{"Timestamp":3869,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4437,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4773,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4917,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5053,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5269,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5773,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6317,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6549,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6829,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7501,"Mod":0,"Key":256,"Ch":96},{"Timestamp":8429,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9349,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10197,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10530,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10546,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10563,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10579,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10595,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10611,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10628,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10645,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10662,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10678,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10694,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10711,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10728,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10745,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10761,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10777,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10794,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10810,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10827,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10844,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10860,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10877,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10895,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10911,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10927,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10943,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10960,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10977,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10993,"Mod":0,"Key":257,"Ch":0},{"Timestamp":12005,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12349,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12909,"Mod":0,"Key":257,"Ch":0},{"Timestamp":13276,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14301,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14836,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15597,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15930,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15946,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15962,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15978,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15995,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16011,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16028,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16044,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16060,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16076,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16093,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16109,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16126,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16143,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16160,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16177,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16194,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16210,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16573,"Mod":0,"Key":257,"Ch":0},{"Timestamp":16741,"Mod":0,"Key":257,"Ch":0},{"Timestamp":17053,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17565,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18109,"Mod":0,"Key":258,"Ch":0},{"Timestamp":18357,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19157,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20012,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]} \ No newline at end of file diff --git a/test/integration/mergeConflicts/setup.sh b/test/integration/mergeConflicts/setup.sh deleted file mode 100644 index 5182e5eae..000000000 --- a/test/integration/mergeConflicts/setup.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - - -function add_spacing { - for i in {1..60} - do - echo "..." >> $1 - done -} - -mkdir directory -echo "test1" > directory/file -echo "test1" > directory/file2 - - -echo "Here is a story that has been told throuhg the ages" >> file1 - -git add file1 -git add directory -git commit -m "first commit" - -git checkout -b feature/cherry-picking - -echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 -echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 - -git add . - -git commit -am "first commit freshman year" - -echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 - -git add . - -git commit -am "second commit subway eat fresh" - -echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 - -git add . - -git commit -am "third commit fresh" - -echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 - -git add . - -git commit -am "fourth commit cool" - -echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 - -git add . - -git commit -am "fifth commit nice" - -echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 - -git add . - -git commit -am "sixth commit haha" - -echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 - -git add . - -git commit -am "seventh commit yeah" - -echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 - -git add . - -git commit -am "eighth commit woo" - - -git checkout -b develop -echo "once upon a time there was a dog" >> file1 -add_spacing file1 -echo "once upon a time there was another dog" >> file1 -git add file1 -echo "test2" > directory/file -echo "test2" > directory/file2 -git add directory -git commit -m "first commit on develop" - - -git checkout master -echo "once upon a time there was a cat" >> file1 -add_spacing file1 -echo "once upon a time there was another cat" >> file1 -git add file1 -echo "test3" > directory/file -echo "test3" > directory/file2 -git add directory -git commit -m "first commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file3 -git add file3 -git commit -m "second commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file3 -git add file3 -git commit -m "second commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file4 -git add file4 -git commit -m "third commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file4 -git add file4 -git commit -m "third commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file5 -git add file5 -git commit -m "fourth commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file5 -git add file5 -git commit -m "fourth commit on master" - - -# this is for the autostash feature - -git checkout -b base_branch - -echo "original1\noriginal2\noriginal3" > file -git add file -git commit -m "file" - -git checkout -b other_branch - -git checkout base_branch - -echo "new1\noriginal2\noriginal3" > file -git add file -git commit -m "file changed" - -git checkout other_branch - -echo "new2\noriginal2\noriginal3" > file diff --git a/test/integration/mergeConflicts/test.json b/test/integration/mergeConflicts/test.json deleted file mode 100644 index 1082379ed..000000000 --- a/test/integration/mergeConflicts/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 10 } diff --git a/test/integration/mergeConflictsFiltered/config/config.yml b/test/integration/mergeConflictsFiltered/config/config.yml deleted file mode 100644 index 718ebf70d..000000000 --- a/test/integration/mergeConflictsFiltered/config/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -disableStartupPopups: true -gui: - showFileTree: false -refresher: - refreshInterval: 1 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index f08e0d5c6..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,38 +0,0 @@ -Merge branch 'develop' into other_branch - -# Conflicts: -# directory/file -# directory/file2 -# file1 -# file3 -# file4 -# file5 -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflictsFiltered/actual/.git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch other_branch -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# new file: cherrypicking1 -# new file: cherrypicking2 -# new file: cherrypicking4 -# new file: cherrypicking5 -# new file: cherrypicking6 -# new file: cherrypicking7 -# new file: cherrypicking8 -# new file: cherrypicking9 -# modified: directory/file -# modified: file3 -# modified: file4 -# -# Untracked files: -# cherrypicking3 -# diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/HEAD deleted file mode 100644 index 904a2e296..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index c71cd262c..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -c62b5bc94e327ddb9b545213ff77b207ade48aba diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/config b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/description b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflictsFiltered/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/mergeConflictsFiltered/expected/repo/.git_keep/index b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/index deleted file mode 100644 index bf18bbf79..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflictsFiltered/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/mergeConflictsFiltered/expected/repo/.git_keep/logs/HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 089a8bdef..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,33 +0,0 @@ -0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 commit (initial): first commit -f37ec566036d715d6995f55dbc82a4fb3cf56f2f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 checkout: moving from master to feature/cherry-picking -f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI 1643618835 +1100 commit: first commit freshman year -21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI 1643618835 +1100 commit: second commit subway eat fresh -0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI 1643618835 +1100 commit: third commit fresh -72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI 1643618835 +1100 commit: fourth commit cool -67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI 1643618835 +1100 commit: fifth commit nice -4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI 1643618835 +1100 commit: sixth commit haha -796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI 1643618835 +1100 commit: seventh commit yeah -41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 commit: eighth commit woo -d88617710499a59992caf98d6df1b5f981c58ab1 d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 checkout: moving from feature/cherry-picking to develop -d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI 1643618835 +1100 commit: first commit on develop -fa5c5dac095b577173e47b4a0c139525eced009f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 checkout: moving from develop to master -f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI 1643618835 +1100 commit: first commit on master -abdaa06b758aa198cc4afb9c406c87c5690d0ca0 fa5c5dac095b577173e47b4a0c139525eced009f CI 1643618835 +1100 checkout: moving from master to develop -fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI 1643618835 +1100 commit: second commit on develop -6c590c6a21f4e6d335528b5ecf6c52993b914996 abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI 1643618835 +1100 checkout: moving from develop to master -abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI 1643618835 +1100 commit: second commit on master -dd401e3ee3d58b648207cee7f737364a37139bea 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI 1643618835 +1100 checkout: moving from master to develop -6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI 1643618835 +1100 commit: third commit on develop -b2afb2548f2d143fdd691058f2283b03933a1749 dd401e3ee3d58b648207cee7f737364a37139bea CI 1643618835 +1100 checkout: moving from develop to master -dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI 1643618835 +1100 commit: third commit on master -34d20faa891d1857610dce8f790a35b702ebd7ee b2afb2548f2d143fdd691058f2283b03933a1749 CI 1643618835 +1100 checkout: moving from master to develop -b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI 1643618835 +1100 commit: fourth commit on develop -9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 34d20faa891d1857610dce8f790a35b702ebd7ee CI 1643618835 +1100 checkout: moving from develop to master -34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 commit: fourth commit on master -d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 checkout: moving from master to base_branch -d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 commit: file -c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 checkout: moving from base_branch to other_branch -c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 checkout: moving from other_branch to base_branch -c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI 1643618835 +1100 commit: file changed -a51a44d96e13555215619b32065d0a22d95b8476 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 checkout: moving from base_branch to other_branch -c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch deleted file mode 100644 index 9b14238c0..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 branch: Created from HEAD -d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 commit: file -c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI 1643618835 +1100 commit: file changed diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 59e1aede7..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 branch: Created from HEAD -d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI 1643618835 +1100 commit: first commit on develop -fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI 1643618835 +1100 commit: second commit on develop -6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI 1643618835 +1100 commit: third commit on develop -b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI 1643618835 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking deleted file mode 100644 index 752d03eb6..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 branch: Created from HEAD -f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI 1643618835 +1100 commit: first commit freshman year -21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI 1643618835 +1100 commit: second commit subway eat fresh -0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI 1643618835 +1100 commit: third commit fresh -72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI 1643618835 +1100 commit: fourth commit cool -67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI 1643618835 +1100 commit: fifth commit nice -4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI 1643618835 +1100 commit: sixth commit haha -796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI 1643618835 +1100 commit: seventh commit yeah -41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d27b9c51b..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 commit (initial): first commit -f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI 1643618835 +1100 commit: first commit on master -abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI 1643618835 +1100 commit: second commit on master -dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI 1643618835 +1100 commit: third commit on master -34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index 5842c42d8..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 branch: Created from HEAD -c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd deleted file mode 100644 index aa6525a94..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 deleted file mode 100644 index 25389c9d6..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c deleted file mode 100644 index fd879a5f3..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 deleted file mode 100644 index 9b8af5fe7..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d1..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 deleted file mode 100644 index 1cafb95f9..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc deleted file mode 100644 index 8d46c2d8b..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc +++ /dev/null @@ -1 +0,0 @@ -xKj1)z_{L0jjcdǐ d[TAuP0:@~"0hQ"$.1=>seɖs-:IVZf {\NFu;%qç<~cɽ{jk:&wt BC \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 deleted file mode 100644 index 991774643..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 deleted file mode 100644 index 864410e1e..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 deleted file mode 100644 index ed74cea0a..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 deleted file mode 100644 index 4a9f30d37..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd deleted file mode 100644 index e8d63bced..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee deleted file mode 100644 index d729e28f3..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee +++ /dev/null @@ -1,3 +0,0 @@ -xA -0a9tDzi3cK-x7m9ߝj1[OIbd8B:]=+(2,Α"VHUlpai7PZ8#z8Ue- ~ -'d}}?+ \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c deleted file mode 100644 index 394c5a294..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 deleted file mode 100644 index 74bc806ad..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]ATzI34)ɴMK0 |>o\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d deleted file mode 100644 index 9e653599d..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]d]ɔ -ƖEoo }Z ]D)vLeȻMNHa|#ENc`R융Tßsm*z -!? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 deleted file mode 100644 index e0670d284..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 +++ /dev/null @@ -1 +0,0 @@ -x 0CvL\jVОW=MXp!kD}z}eˍ!z!%us˟\-'Z_R=K \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 deleted file mode 100644 index e58f89e99..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c deleted file mode 100644 index 7302ca34e..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 deleted file mode 100644 index 88f896a17..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 +++ /dev/null @@ -1,4 +0,0 @@ -xM -0F)f_(3N(cgDAHZz -@{Tu^ -$0B2b8ڑQ%=U &\EihC.q¨]QWq'}KhHtNi8#J)z.Ҟ~ y[? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 deleted file mode 100644 index 168b5c5f9..000000000 Binary files a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 and /dev/null differ diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/base_branch deleted file mode 100644 index 504dbe400..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/base_branch +++ /dev/null @@ -1 +0,0 @@ -a51a44d96e13555215619b32065d0a22d95b8476 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index a63801a54..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/feature/cherry-picking deleted file mode 100644 index d09c7755e..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/feature/cherry-picking +++ /dev/null @@ -1 +0,0 @@ -d88617710499a59992caf98d6df1b5f981c58ab1 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 7a24b5e07..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index 1e24c496e..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking1 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking1 deleted file mode 100644 index 6101e9354..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking1 +++ /dev/null @@ -1 +0,0 @@ -this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking2 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking2 deleted file mode 100644 index 889b0fdfe..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking2 +++ /dev/null @@ -1 +0,0 @@ -this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking3 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking3 deleted file mode 100644 index eb90e8d7b..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking3 +++ /dev/null @@ -1 +0,0 @@ -this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking4 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking4 deleted file mode 100644 index b4121e2d6..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking4 +++ /dev/null @@ -1 +0,0 @@ -this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking5 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking5 deleted file mode 100644 index afa76754c..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking5 +++ /dev/null @@ -1 +0,0 @@ -this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking6 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking6 deleted file mode 100644 index 18f469bc7..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking6 +++ /dev/null @@ -1 +0,0 @@ -this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking7 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking7 deleted file mode 100644 index e448ae5bf..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking7 +++ /dev/null @@ -1 +0,0 @@ -this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking8 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking8 deleted file mode 100644 index 90a84fd62..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking8 +++ /dev/null @@ -1 +0,0 @@ -this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking9 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking9 deleted file mode 100644 index 22b0fd807..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking9 +++ /dev/null @@ -1 +0,0 @@ -this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictsFiltered/expected/repo/directory/file b/test/integration/mergeConflictsFiltered/expected/repo/directory/file deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/directory/file +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/directory/file2 b/test/integration/mergeConflictsFiltered/expected/repo/directory/file2 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/directory/file2 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/file b/test/integration/mergeConflictsFiltered/expected/repo/file deleted file mode 100644 index 5da4d9200..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -original1\noriginal2\noriginal3 diff --git a/test/integration/mergeConflictsFiltered/expected/repo/file1 b/test/integration/mergeConflictsFiltered/expected/repo/file1 deleted file mode 100644 index dcd348507..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/file1 +++ /dev/null @@ -1,63 +0,0 @@ -Here is a story that has been told throuhg the ages -once upon a time there was a cat -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another cat diff --git a/test/integration/mergeConflictsFiltered/expected/repo/file3 b/test/integration/mergeConflictsFiltered/expected/repo/file3 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/mergeConflictsFiltered/expected/repo/file4 b/test/integration/mergeConflictsFiltered/expected/repo/file4 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/mergeConflictsFiltered/expected/repo/file5 b/test/integration/mergeConflictsFiltered/expected/repo/file5 deleted file mode 100644 index e3ae5c6d8..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a horse diff --git a/test/integration/mergeConflictsFiltered/recording.json b/test/integration/mergeConflictsFiltered/recording.json deleted file mode 100644 index 6d620e9e3..000000000 --- a/test/integration/mergeConflictsFiltered/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":682,"Mod":0,"Key":259,"Ch":0},{"Timestamp":929,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1104,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1417,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1953,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2241,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2729,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3233,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3489,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4048,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4353,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4673,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5208,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6408,"Mod":2,"Key":2,"Ch":2},{"Timestamp":7145,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7625,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7841,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8520,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8897,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9233,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9633,"Mod":2,"Key":2,"Ch":2},{"Timestamp":10016,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10393,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10881,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11137,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11473,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11809,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12056,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12354,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12921,"Mod":2,"Key":2,"Ch":2},{"Timestamp":13481,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13681,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13945,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14992,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15929,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16185,"Mod":0,"Key":257,"Ch":0},{"Timestamp":16401,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16753,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17353,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17640,"Mod":0,"Key":258,"Ch":0},{"Timestamp":17825,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18249,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18457,"Mod":0,"Key":257,"Ch":0},{"Timestamp":18673,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19593,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20641,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/setup.sh b/test/integration/mergeConflictsFiltered/setup.sh deleted file mode 100644 index 63c51ded4..000000000 --- a/test/integration/mergeConflictsFiltered/setup.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - - -function add_spacing { - for i in {1..60} - do - echo "..." >> $1 - done -} - -mkdir directory -echo "test1" > directory/file -echo "test1" > directory/file2 - - -echo "Here is a story that has been told throuhg the ages" >> file1 - -git add file1 -git add directory -git commit -m "first commit" - -git checkout -b feature/cherry-picking - -echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 -echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 - -git add . - -git commit -am "first commit freshman year" - -echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 - -git add . - -git commit -am "second commit subway eat fresh" - -echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 - -git add . - -git commit -am "third commit fresh" - -echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 - -git add . - -git commit -am "fourth commit cool" - -echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 - -git add . - -git commit -am "fifth commit nice" - -echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 - -git add . - -git commit -am "sixth commit haha" - -echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 - -git add . - -git commit -am "seventh commit yeah" - -echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 - -git add . - -git commit -am "eighth commit woo" - - -git checkout -b develop -echo "once upon a time there was a dog" >> file1 -add_spacing file1 -echo "once upon a time there was another dog" >> file1 -git add file1 -echo "test2" > directory/file -echo "test2" > directory/file2 -git add directory -git commit -m "first commit on develop" - - -git checkout master -echo "once upon a time there was a cat" >> file1 -add_spacing file1 -echo "once upon a time there was another cat" >> file1 -git add file1 -echo "test3" > directory/file -echo "test3" > directory/file2 -git add directory -git commit -m "first commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file3 -git add file3 -git commit -m "second commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file3 -git add file3 -git commit -m "second commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file4 -git add file4 -git commit -m "third commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file4 -git add file4 -git commit -m "third commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file5 -git add file5 -git commit -m "fourth commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file5 -git add file5 -git commit -m "fourth commit on master" - - -# this is for the autostash feature - -git checkout -b base_branch - -echo "original1\noriginal2\noriginal3" > file -git add file -git commit -m "file" - -git checkout -b other_branch - -git checkout base_branch - -echo "new1\noriginal2\noriginal3" > file -git add file -git commit -m "file changed" - -git checkout other_branch diff --git a/test/integration/mergeConflictsFiltered/test.json b/test/integration/mergeConflictsFiltered/test.json deleted file mode 100644 index 7402aede2..000000000 --- a/test/integration/mergeConflictsFiltered/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Verify that when we get merge conflicts we filter out any non-conflicted files", - "speed": 5 -} diff --git a/test/integration/mergeConflictsResolvedExternally/config/config.yml b/test/integration/mergeConflictsResolvedExternally/config/config.yml deleted file mode 100644 index 33b63939a..000000000 --- a/test/integration/mergeConflictsResolvedExternally/config/config.yml +++ /dev/null @@ -1,6 +0,0 @@ -disableStartupPopups: true -customCommands: - - key: 'N' - description: 'Resolve conflict' - context: 'files' - command: 'echo "master2" > file' diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9c1b1e853..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,20 +0,0 @@ -Merge branch 'master' into other - -# Conflicts: -# file -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflictsResolvedExternally/actual/.git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch other -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# modified: file -# diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/HEAD deleted file mode 100644 index 0ca960536..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 30d51fe1d..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -769c8b8d89700f6f196b8331159150746a839662 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/config b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/description b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflictsResolvedExternally/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/mergeConflictsResolvedExternally/expected/repo/.git_keep/index b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/index deleted file mode 100644 index 61de7270a..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflictsResolvedExternally/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/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index e316f4ff1..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI 1642403134 +1100 commit (initial): master1 -03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI 1642403134 +1100 checkout: moving from master to other -03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 769c8b8d89700f6f196b8331159150746a839662 CI 1642403134 +1100 commit: other1 -769c8b8d89700f6f196b8331159150746a839662 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI 1642403134 +1100 checkout: moving from other to master -03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 691ee9e9d9c654c81214f56c514ff725f46cb9e4 CI 1642403134 +1100 commit: master2 -691ee9e9d9c654c81214f56c514ff725f46cb9e4 769c8b8d89700f6f196b8331159150746a839662 CI 1642403134 +1100 checkout: moving from master to other -769c8b8d89700f6f196b8331159150746a839662 f2df244fb87b6ba1d2ab484d76c66baba168a867 CI 1642403138 +1100 commit (merge): Merge branch 'master' into other diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 2e39e4fcd..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI 1642403134 +1100 commit (initial): master1 -03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 691ee9e9d9c654c81214f56c514ff725f46cb9e4 CI 1642403134 +1100 commit: master2 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/other b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/other deleted file mode 100644 index a462e4b21..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/other +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI 1642403134 +1100 branch: Created from HEAD -03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 769c8b8d89700f6f196b8331159150746a839662 CI 1642403134 +1100 commit: other1 -769c8b8d89700f6f196b8331159150746a839662 f2df244fb87b6ba1d2ab484d76c66baba168a867 CI 1642403138 +1100 commit (merge): Merge branch 'master' into other diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 deleted file mode 100644 index e91b55a9f..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 +++ /dev/null @@ -1,4 +0,0 @@ -xA -1 @Q=E$v!"j) -X#<=Bȹą}TYbQ8%Hϸ .vӯ멧 -#{8!Ydܙ'&xR-k \ No newline at end of file diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc deleted file mode 100644 index 20a13c218..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 deleted file mode 100644 index eb74d7a88..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 deleted file mode 100644 index 660150da8..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 deleted file mode 100644 index fdb7cf9f9..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 deleted file mode 100644 index ebc29f7ce..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad deleted file mode 100644 index 9ccb24501..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 deleted file mode 100644 index f6c47ec28..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9Ed1"BW=FL`L <=[j}BUjHGvp%0= ƫc@2I^\c( 1{VL }d?ck΋C/V=;Bb{F0G=Mv4? -8 \ No newline at end of file diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 deleted file mode 100644 index abea13842..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 deleted file mode 100644 index 7d88244be..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 deleted file mode 100644 index a8bc1219e..000000000 Binary files a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 and /dev/null differ diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index b735e793a..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -691ee9e9d9c654c81214f56c514ff725f46cb9e4 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/other b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/other deleted file mode 100644 index 52ac4afa8..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/other +++ /dev/null @@ -1 +0,0 @@ -f2df244fb87b6ba1d2ab484d76c66baba168a867 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/repo/file b/test/integration/mergeConflictsResolvedExternally/expected/repo/file deleted file mode 100644 index 0884a47e0..000000000 --- a/test/integration/mergeConflictsResolvedExternally/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -master2 diff --git a/test/integration/mergeConflictsResolvedExternally/recording.json b/test/integration/mergeConflictsResolvedExternally/recording.json deleted file mode 100644 index 21b60ce5a..000000000 --- a/test/integration/mergeConflictsResolvedExternally/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":438,"Mod":0,"Key":259,"Ch":0},{"Timestamp":663,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1206,"Mod":0,"Key":256,"Ch":77},{"Timestamp":1487,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2045,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2951,"Mod":0,"Key":256,"Ch":78},{"Timestamp":3606,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4343,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/mergeConflictsResolvedExternally/setup.sh b/test/integration/mergeConflictsResolvedExternally/setup.sh deleted file mode 100644 index e1126d2c3..000000000 --- a/test/integration/mergeConflictsResolvedExternally/setup.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - -git checkout -b master - -echo "master1" > file -git add . -git commit -m "master1" - -git checkout -b other - -echo "other1" > file -git add . -git commit -m "other1" - -git checkout master - -echo "master2" > file -git add . -git commit -m "master2" - -git checkout other diff --git a/test/integration/mergeConflictsResolvedExternally/test.json b/test/integration/mergeConflictsResolvedExternally/test.json deleted file mode 100644 index e51abcada..000000000 --- a/test/integration/mergeConflictsResolvedExternally/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "This test verifies that merge conflicts resolved externally are recognised by lazygit and the user is prompted to continue", - "speed": 10 -}