diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 7b8e8d3de..d0b4d736c 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -530,7 +530,7 @@ func (gui *Gui) handleStatusFilterPressed() error { func (gui *Gui) setStatusFiltering(filter filetree.FileTreeDisplayFilter) error { state := gui.State - state.FileTreeViewModel.SetDisplayFilter(filter) + state.FileTreeViewModel.SetFilter(filter) return gui.handleRefreshFiles() } @@ -640,6 +640,19 @@ func (gui *Gui) refreshStateFiles() error { } } + // only taking over the filter if it hasn't already been set by the user. + // Though this does make it impossible for the user to actually say they want to display all if + // conflicts are currently being shown. Hmm. Worth it I reckon. If we need to add some + // extra state here to see if the user's set the filter themselves we can do that, but + // I'd prefer to maintain as little state as possible. + if conflictFileCount > 0 { + if state.FileTreeViewModel.GetFilter() == filetree.DisplayAll { + state.FileTreeViewModel.SetFilter(filetree.DisplayConflicted) + } + } else if state.FileTreeViewModel.GetFilter() == filetree.DisplayConflicted { + state.FileTreeViewModel.SetFilter(filetree.DisplayAll) + } + state.FileTreeViewModel.SetFiles(files) state.FileTreeViewModel.RWMutex.Unlock() diff --git a/pkg/gui/filetree/file_tree_view_model.go b/pkg/gui/filetree/file_tree_view_model.go index 7e8497c96..01eb751e3 100644 --- a/pkg/gui/filetree/file_tree_view_model.go +++ b/pkg/gui/filetree/file_tree_view_model.go @@ -1,6 +1,7 @@ package filetree import ( + "fmt" "sync" "github.com/jesseduffield/lazygit/pkg/commands/models" @@ -13,6 +14,8 @@ const ( DisplayAll FileTreeDisplayFilter = iota DisplayStaged DisplayUnstaged + // this shows files with merge conflicts + DisplayConflicted ) type FileTreeViewModel struct { @@ -49,29 +52,32 @@ func (self *FileTreeViewModel) ExpandToPath(path string) { func (self *FileTreeViewModel) GetFilesForDisplay() []*models.File { files := self.files - if self.filter == DisplayAll { + + switch self.filter { + case DisplayAll: return files + case DisplayStaged: + return self.FilterFiles(func(file *models.File) bool { return file.HasStagedChanges }) + case DisplayUnstaged: + return self.FilterFiles(func(file *models.File) bool { return file.HasUnstagedChanges }) + case DisplayConflicted: + return self.FilterFiles(func(file *models.File) bool { return file.HasMergeConflicts }) + default: + panic(fmt.Sprintf("Unexpected files display filter: %d", self.filter)) } +} +func (self *FileTreeViewModel) FilterFiles(test func(*models.File) bool) []*models.File { result := make([]*models.File, 0) - if self.filter == DisplayStaged { - for _, file := range files { - if file.HasStagedChanges { - result = append(result, file) - } - } - } else { - for _, file := range files { - if !file.HasStagedChanges { - result = append(result, file) - } + for _, file := range self.files { + if test(file) { + result = append(result, file) } } - return result } -func (self *FileTreeViewModel) SetDisplayFilter(filter FileTreeDisplayFilter) { +func (self *FileTreeViewModel) SetFilter(filter FileTreeDisplayFilter) { self.filter = filter self.SetTree() } @@ -147,3 +153,7 @@ func (self *FileTreeViewModel) Tree() INode { func (self *FileTreeViewModel) CollapsedPaths() CollapsedPaths { return self.collapsedPaths } + +func (self *FileTreeViewModel) GetFilter() FileTreeDisplayFilter { + return self.filter +} diff --git a/pkg/gui/filetree/file_tree_view_model_test.go b/pkg/gui/filetree/file_tree_view_model_test.go index 10c32d31d..89b8e74df 100644 --- a/pkg/gui/filetree/file_tree_view_model_test.go +++ b/pkg/gui/filetree/file_tree_view_model_test.go @@ -54,6 +54,20 @@ func TestFilterAction(t *testing.T) { {Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true}, }, }, + { + name: "filter conflicted files", + filter: DisplayConflicted, + files: []*models.File{ + {Name: "dir2/dir2/file4", ShortStatus: "DU", HasMergeConflicts: true}, + {Name: "dir2/file5", ShortStatus: "M ", HasUnstagedChanges: true}, + {Name: "dir2/file6", ShortStatus: " M", HasStagedChanges: true}, + {Name: "file1", ShortStatus: "UU", HasMergeConflicts: true, HasInlineMergeConflicts: true}, + }, + expected: []*models.File{ + {Name: "dir2/dir2/file4", ShortStatus: "DU", HasMergeConflicts: true}, + {Name: "file1", ShortStatus: "UU", HasMergeConflicts: true, HasInlineMergeConflicts: true}, + }, + }, } for _, s := range scenarios { diff --git a/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG index 8ef87ec12..42bf03720 100644 --- a/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG @@ -3,15 +3,16 @@ first commit on master # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# interactive rebase in progress; onto e23041d +# interactive rebase in progress; onto e957aaf # Last command done (1 command done): -# pick 5bc64a0 first commit on master +# pick 69f11ae first commit on master # Next commands to do (3 remaining commands): -# drop 8c464cc second commit on master -# drop 9ec3d8f third commit on master -# You are currently rebasing branch 'master' on 'e23041d'. +# drop 8d3bd1c second commit on master +# drop 3e1706c third commit on master +# You are currently rebasing branch 'master' on 'e957aaf'. # # Changes to be committed: +# modified: directory/file # modified: directory/file2 # modified: file1 # diff --git a/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD b/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD index 4c0b2873b..28cab2e49 100644 --- a/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD +++ b/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -5bc64a01e7b980e97f714fba45aa18f0eef726fb +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 diff --git a/test/integration/branchRebase/expected/.git_keep/index b/test/integration/branchRebase/expected/.git_keep/index index 7611a1faf..12d743587 100644 Binary files a/test/integration/branchRebase/expected/.git_keep/index and b/test/integration/branchRebase/expected/.git_keep/index differ diff --git a/test/integration/branchRebase/expected/.git_keep/logs/HEAD b/test/integration/branchRebase/expected/.git_keep/logs/HEAD index 7db77f413..e4a5b4d7a 100644 --- a/test/integration/branchRebase/expected/.git_keep/logs/HEAD +++ b/test/integration/branchRebase/expected/.git_keep/logs/HEAD @@ -1,22 +1,22 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 commit (initial): first commit -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 checkout: moving from master to develop -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 commit: first commit on develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 checkout: moving from develop to master -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 commit: first commit on master -5bc64a01e7b980e97f714fba45aa18f0eef726fb f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 checkout: moving from master to develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 commit: second commit on develop -f9ad2a0d946867abbd3228fc132afef480287c27 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 checkout: moving from develop to master -5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 commit: second commit on master -8c464cc13c9ad8d00604ec9b646e2b2187706287 f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 checkout: moving from master to develop -f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 commit: third commit on develop -7f8238e605705a3b485f653df7779e43a41f4e76 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 checkout: moving from develop to master -8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 commit: third commit on master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 checkout: moving from master to develop -7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686669 +1000 commit: fourth commit on develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 checkout: moving from develop to master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686669 +1000 commit: fourth commit on master -4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686671 +1000 rebase -i (start): checkout develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686672 +1000 rebase -i (abort): updating HEAD -4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686674 +1000 rebase -i (start): checkout develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (continue): first commit on master -cea4333c6fff70e6248efee2b3a414a4e11a7956 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (finish): returning to refs/heads/master +0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from master to develop +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop +9a6521a3788b4d9e679b1709130ff8dc3f73ab18 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from develop to master +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 checkout: moving from master to develop +9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop +a8381c9130b03aef530b60b5a4546b93dc59ae12 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 checkout: moving from develop to master +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master +8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 checkout: moving from master to develop +a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop +7095508e3cd0fd40572f8e711170db38ef2342d7 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 checkout: moving from develop to master +8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master +3e1706cdf670f5641be0715178471abfc9ed1748 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 checkout: moving from master to develop +7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 checkout: moving from develop to master +3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master +f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188756 +1100 rebase -i (start): checkout develop +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188757 +1100 rebase -i (abort): updating HEAD +f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188758 +1100 rebase -i (start): checkout develop +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (continue): first commit on master +42597904331c82f6d5c8c902755c8dfa5767ea95 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop index b13e37d19..06dc78ae9 100644 --- a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 branch: Created from HEAD -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 commit: first commit on develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 commit: second commit on develop -f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 commit: third commit on develop -7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686669 +1000 commit: fourth commit on develop +0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 branch: Created from HEAD +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop +9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop +a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop +7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop diff --git a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master index 9be1c0f29..1856f13e4 100644 --- a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 commit (initial): first commit -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 commit: first commit on master -5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 commit: second commit on master -8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 commit: third commit on master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686669 +1000 commit: fourth commit on master -4d34b8913eb0991ca63f8f7877ab8408e1511b3d cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (finish): refs/heads/master onto e23041d5ff1f243faf319cc5e48e6d57384e4f37 +0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit +3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master +69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master +8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master +3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master +f5067da83b48f8588edce682fd2715a575f34373 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): refs/heads/master onto e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 b/test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 new file mode 100644 index 000000000..7cc212f4e Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f b/test/integration/branchRebase/expected/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f new file mode 100644 index 000000000..cd608da68 Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 b/test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 new file mode 100644 index 000000000..fcb375444 --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 @@ -0,0 +1,2 @@ +xA +0a9II2cLiR#x| ^VawL 6ZP HVg.Tl*&9Re@)%Xﾴ t! GkC8:T?s՗u/SОPu`.? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 b/test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 new file mode 100644 index 000000000..6ad1bf9cd Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 b/test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 new file mode 100644 index 000000000..1c62a2241 Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/4d/34b8913eb0991ca63f8f7877ab8408e1511b3d b/test/integration/branchRebase/expected/.git_keep/objects/4d/34b8913eb0991ca63f8f7877ab8408e1511b3d deleted file mode 100644 index d790078a9..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/4d/34b8913eb0991ca63f8f7877ab8408e1511b3d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]diDzd2iJM[nR :{KV53 Yj%Zb֔$MҐ]z$(EsĠԓM\7'C?/H-w8zljomuއm\A \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/5b/c64a01e7b980e97f714fba45aa18f0eef726fb b/test/integration/branchRebase/expected/.git_keep/objects/5b/c64a01e7b980e97f714fba45aa18f0eef726fb deleted file mode 100644 index 3cfa68687..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/5b/c64a01e7b980e97f714fba45aa18f0eef726fb and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 new file mode 100644 index 000000000..9633a4077 Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 b/test/integration/branchRebase/expected/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 new file mode 100644 index 000000000..71f3f42ac Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 b/test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 new file mode 100644 index 000000000..7d14e4e29 Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a b/test/integration/branchRebase/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a deleted file mode 100644 index 19670ff5a..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76 b/test/integration/branchRebase/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76 deleted file mode 100644 index 616d411b3..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76 and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 b/test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 deleted file mode 100644 index f968d937a..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]d3)]8A4-xTKy6m5RXH2(=g9EW1W$8AQ}J!Ystn8enѲj1 fHvj6Ku/:Cm@ \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 b/test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 new file mode 100644 index 000000000..5083d8258 --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 @@ -0,0 +1,2 @@ +xM +0F]dDz$A4-x=r-٠#ifv piA*FYWAYae3_-MA" \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440 b/test/integration/branchRebase/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440 deleted file mode 100644 index 01e70b1cc..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440 and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 b/test/integration/branchRebase/expected/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 new file mode 100644 index 000000000..8ed23d6aa --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 @@ -0,0 +1,2 @@ +x +0E]+f/H&DyLQMQ| pWs67ɺ̑4ɸD\5Q7i_gRkdwlkbƠ#&@)#귶0yISi[B,V;OuSWO)mˠ-P-/8|? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d b/test/integration/branchRebase/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d deleted file mode 100644 index b62cda205..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 b/test/integration/branchRebase/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 deleted file mode 100644 index a66fe422e..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 b/test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 deleted file mode 100644 index 43d870c43..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 +++ /dev/null @@ -1,2 +0,0 @@ -x -0D=+ IAI6d%R{SYفeawgGî^ЁeX+$З͠9B{ތDǘKD%IoΫBm]s}UUxNBR(+'S^5GYo (! \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f b/test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f new file mode 100644 index 000000000..0e775a5f8 --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f @@ -0,0 +1,6 @@ +xQ +@ DS +,* +FڦBw#)MRdLPw5' d􂎤)aP:;%6 +zs[h/6|ZW}7 +ձ/K(V(+'g,7c01 \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 b/test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 deleted file mode 100644 index 098dc2c53..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 +++ /dev/null @@ -1,3 +0,0 @@ -x} -0=).H/=1t )m߀en k)K%©DDaG!J*= 1lq)ZΆYȑQ iOv6&j8ue{%riZ,Em??xُ_ -%]>:? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 b/test/integration/branchRebase/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 deleted file mode 100644 index 85b628171..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 b/test/integration/branchRebase/expected/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 new file mode 100644 index 000000000..52090e26c Binary files /dev/null and b/test/integration/branchRebase/expected/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f b/test/integration/branchRebase/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f deleted file mode 100644 index fac587698..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2 b/test/integration/branchRebase/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2 deleted file mode 100644 index db4c3f161..000000000 Binary files a/test/integration/branchRebase/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2 and /dev/null differ diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 b/test/integration/branchRebase/expected/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 new file mode 100644 index 000000000..47681b580 --- /dev/null +++ b/test/integration/branchRebase/expected/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 @@ -0,0 +1,4 @@ +xA +0E]$cL +"BW=FP4% x? O2`"t,GQtЈ|XSZbR{5C8b5Eqd +G[Ki4?K,̀ޓ5pFZjˠlû 1A \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f9/ad2a0d946867abbd3228fc132afef480287c27 b/test/integration/branchRebase/expected/.git_keep/objects/f9/ad2a0d946867abbd3228fc132afef480287c27 deleted file mode 100644 index 13214c210..000000000 --- a/test/integration/branchRebase/expected/.git_keep/objects/f9/ad2a0d946867abbd3228fc132afef480287c27 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F]$ ]fmJ-x[=ރoj|`9M"9t EBZGcvjM)5Y;BlJQS4*~[`4MĄGV;OuSWORA[[mU_.@a \ No newline at end of file diff --git a/test/integration/branchRebase/expected/.git_keep/refs/heads/develop b/test/integration/branchRebase/expected/.git_keep/refs/heads/develop index 9974cd2cd..d77f4721f 100644 --- a/test/integration/branchRebase/expected/.git_keep/refs/heads/develop +++ b/test/integration/branchRebase/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -e23041d5ff1f243faf319cc5e48e6d57384e4f37 +e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/.git_keep/refs/heads/master b/test/integration/branchRebase/expected/.git_keep/refs/heads/master index f0fe9cada..567f6507a 100644 --- a/test/integration/branchRebase/expected/.git_keep/refs/heads/master +++ b/test/integration/branchRebase/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -cea4333c6fff70e6248efee2b3a414a4e11a7956 +42597904331c82f6d5c8c902755c8dfa5767ea95 diff --git a/test/integration/branchRebase/expected/directory/file b/test/integration/branchRebase/expected/directory/file index 180cf8328..df6b0d2bc 100644 --- a/test/integration/branchRebase/expected/directory/file +++ b/test/integration/branchRebase/expected/directory/file @@ -1 +1 @@ -test2 +test3 diff --git a/test/integration/branchRebase/expected/file1 b/test/integration/branchRebase/expected/file1 index dcd348507..5d874a902 100644 --- a/test/integration/branchRebase/expected/file1 +++ b/test/integration/branchRebase/expected/file1 @@ -60,4 +60,4 @@ once upon a time there was a cat ... ... ... -once upon a time there was another cat +once upon a time there was another dog diff --git a/test/integration/branchRebase/recording.json b/test/integration/branchRebase/recording.json index b88bc8ff1..c0da4c16a 100644 --- a/test/integration/branchRebase/recording.json +++ b/test/integration/branchRebase/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":468,"Mod":0,"Key":259,"Ch":0},{"Timestamp":860,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1196,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1869,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2984,"Mod":0,"Key":27,"Ch":0},{"Timestamp":4124,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4764,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5756,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6308,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6572,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7204,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7468,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7668,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8492,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8604,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8957,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9132,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9556,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10067,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10692,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10989,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11164,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11596,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11996,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12493,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12757,"Mod":0,"Key":257,"Ch":0},{"Timestamp":12900,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13245,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13380,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13788,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14516,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15604,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":617,"Mod":0,"Key":259,"Ch":0},{"Timestamp":922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1176,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1512,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2797,"Mod":0,"Key":27,"Ch":0},{"Timestamp":3632,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4760,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5105,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5376,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5721,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6186,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6401,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6592,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6840,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7105,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7612,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8160,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8680,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9080,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9464,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9808,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10372,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11249,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12088,"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/config/config.yml b/test/integration/mergeConflictsFiltered/config/config.yml new file mode 100644 index 000000000..718ebf70d --- /dev/null +++ b/test/integration/mergeConflictsFiltered/config/config.yml @@ -0,0 +1,5 @@ +disableStartupPopups: true +gui: + showFileTree: false +refresher: + refreshInterval: 1 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..80977d9d1 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,40 @@ +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: cherrypicking3 +# new file: cherrypicking4 +# new file: cherrypicking5 +# new file: cherrypicking7 +# new file: cherrypicking8 +# new file: cherrypicking9 +# modified: directory/file +# modified: directory/file2 +# modified: file1 +# modified: file4 +# modified: file5 +# +# Untracked files: +# cherrypicking6 +# diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD new file mode 100644 index 000000000..904a2e296 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..84de0034b --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/config b/test/integration/mergeConflictsFiltered/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/config @@ -0,0 +1,10 @@ +[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/.git_keep/description b/test/integration/mergeConflictsFiltered/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/index b/test/integration/mergeConflictsFiltered/expected/.git_keep/index new file mode 100644 index 000000000..f455a20fa Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/index differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude b/test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# 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/.git_keep/logs/HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..8d64a77dd --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD @@ -0,0 +1,33 @@ +0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 commit (initial): first commit +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 checkout: moving from master to feature/cherry-picking +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI 1643188552 +1100 commit: first commit freshman year +f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI 1643188552 +1100 commit: second commit subway eat fresh +34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI 1643188552 +1100 commit: third commit fresh +66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI 1643188552 +1100 commit: fourth commit cool +f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI 1643188552 +1100 commit: fifth commit nice +4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI 1643188552 +1100 commit: sixth commit haha +93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI 1643188552 +1100 commit: seventh commit yeah +951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 commit: eighth commit woo +1fb30058516518ac1579a8df132b0e4dade8e51d 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 checkout: moving from feature/cherry-picking to develop +1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 commit: first commit on develop +40844e90419651d425c0845ec6f7c64ff63ebf03 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 checkout: moving from develop to master +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 commit: first commit on master +165a3cfaf6a1d3d757fb7b1c509598a395108079 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 checkout: moving from master to develop +40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 commit: second commit on develop +9c59217622ae74189d18f2992121f97dd28e966b 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 checkout: moving from develop to master +165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 commit: second commit on master +454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 checkout: moving from master to develop +9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 commit: third commit on develop +ba211bf3464f9c0429483a83963c1c69e1f53d4e 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 checkout: moving from develop to master +454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 commit: third commit on master +a83aac98467d005729bc9d80fe98abba47d41495 ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 checkout: moving from master to develop +ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI 1643188552 +1100 commit: fourth commit on develop +85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 checkout: moving from develop to master +a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 commit: fourth commit on master +cd97d8e8ca03000f761f0e041cea0b6039923e70 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 checkout: moving from master to base_branch +cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 commit: file +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from base_branch to other_branch +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from other_branch to base_branch +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI 1643188552 +1100 commit: file changed +06d48b81c12e9c1a3cc2704c0db337639a8cdf85 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from base_branch to other_branch +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch new file mode 100644 index 000000000..1d7992ef4 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 branch: Created from HEAD +cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 commit: file +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI 1643188552 +1100 commit: file changed diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop new file mode 100644 index 000000000..52fde82d1 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 branch: Created from HEAD +1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 commit: first commit on develop +40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 commit: second commit on develop +9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 commit: third commit on develop +ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI 1643188552 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..a77478ee9 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 branch: Created from HEAD +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI 1643188552 +1100 commit: first commit freshman year +f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI 1643188552 +1100 commit: second commit subway eat fresh +34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI 1643188552 +1100 commit: third commit fresh +66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI 1643188552 +1100 commit: fourth commit cool +f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI 1643188552 +1100 commit: fifth commit nice +4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI 1643188552 +1100 commit: sixth commit haha +93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI 1643188552 +1100 commit: seventh commit yeah +951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..7f0b5ea9c --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 commit (initial): first commit +416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 commit: first commit on master +165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 commit: second commit on master +454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 commit: third commit on master +a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..2534238d7 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 branch: Created from HEAD +ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 new file mode 100644 index 000000000..984eeda3b Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d new file mode 100644 index 000000000..8d42c4c9e Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 new file mode 100644 index 000000000..56bdc0b18 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 @@ -0,0 +1,2 @@ +xM +0F]$g"BW=4`F{֥vD -$ώEbBlA.΄̨ YodyIȻ0pƻ|nO{ gcVSMUY/+? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 new file mode 100644 index 000000000..25389c9d6 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c new file mode 100644 index 000000000..fd879a5f3 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 new file mode 100644 index 000000000..9b8af5fe7 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca new file mode 100644 index 000000000..2b02dc3d1 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d new file mode 100644 index 000000000..82cc46d1c Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 new file mode 100644 index 000000000..1cafb95f9 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 new file mode 100644 index 000000000..01e88b75d Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af new file mode 100644 index 000000000..27c11bb26 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 new file mode 100644 index 000000000..991774643 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 new file mode 100644 index 000000000..864410e1e Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 new file mode 100644 index 000000000..ed74cea0a Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 new file mode 100644 index 000000000..4a9f30d37 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 new file mode 100644 index 000000000..5d4a913e6 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd new file mode 100644 index 000000000..e8d63bced Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c new file mode 100644 index 000000000..394c5a294 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 new file mode 100644 index 000000000..74bc806ad --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 @@ -0,0 +1,2 @@ +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/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 new file mode 100644 index 000000000..cca824fa4 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a new file mode 100644 index 000000000..4f8246e30 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f new file mode 100644 index 000000000..a334cf498 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f @@ -0,0 +1,2 @@ +xM +0]$t"BW=d`FǓZʳAًuD[蝍.yq{^%6bIqҁg.(~Ga:ᲽEjѠDVZWG&iPW(|t[}i>? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 new file mode 100644 index 000000000..8854dbe4e Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 new file mode 100644 index 000000000..5e63d0027 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 new file mode 100644 index 000000000..e0670d284 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 @@ -0,0 +1 @@ +x 0CvL\jVОW=M#Li#x| ^=xպv0N@))&{#C ;xʅԞ<;X9"|AMY9BF}\.T\x7О9gA./k+`nZjc> \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 new file mode 100644 index 000000000..c41ae5c62 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b new file mode 100644 index 000000000..bdc31c789 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b @@ -0,0 +1,3 @@ +xA + E/G'FBV9#)$1Szzn}ey50H &|.ԧ̆F6-6HTSdy 2 ;DţMua0>mȢ]g:Ϲ*? +Y2M}OA7 \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d new file mode 100644 index 000000000..d63de558b Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 new file mode 100644 index 000000000..ea7fa5303 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd new file mode 100644 index 000000000..cdd5f8a93 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e new file mode 100644 index 000000000..cc06d0590 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 new file mode 100644 index 000000000..4eb870a9e --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 @@ -0,0 +1,3 @@ +xK +0@]$DzI:!F-x奵Gݩo"q;}" +h8"BaɓZyWI32b)HvGL*^[ş^ tK^ 08D8#jzLuSW+*\Y}= \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3 new file mode 100644 index 000000000..27ac335e9 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c new file mode 100644 index 000000000..1befd67ac Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b new file mode 100644 index 000000000..174b52052 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 new file mode 100644 index 000000000..ffc277c86 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 new file mode 100644 index 000000000..20ba8aaf2 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab new file mode 100644 index 000000000..92e71009c --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab @@ -0,0 +1,2 @@ +xA + @Ѯ=BѨ3PJ!cԑ& =~sn?o˶sx釪u@P A+֡f'Ř9Ԕ.-S%" ,*#xf5Om'{~em}XG"S]͋>"94 \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c new file mode 100644 index 000000000..7302ca34e Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 new file mode 100644 index 000000000..4aa46eb8c Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e new file mode 100644 index 000000000..b97085682 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 new file mode 100644 index 000000000..008bb1a65 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70 new file mode 100644 index 000000000..a14b07295 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 new file mode 100644 index 000000000..ab357ec23 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 new file mode 100644 index 000000000..198bff1ec Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 new file mode 100644 index 000000000..af687b620 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c new file mode 100644 index 000000000..74c919681 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c @@ -0,0 +1 @@ +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/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e new file mode 100644 index 000000000..3a7ee91ea Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 new file mode 100644 index 000000000..714e20cb7 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 new file mode 100644 index 000000000..83998943a Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d new file mode 100644 index 000000000..b047d6827 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 new file mode 100644 index 000000000..4992422c7 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 new file mode 100644 index 000000000..3688d63f9 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 new file mode 100644 index 000000000..e9f9f0881 Binary files /dev/null and b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 differ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 new file mode 100644 index 000000000..9be5e4363 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 @@ -0,0 +1,2 @@ +xA +1=s$dcaOlJwxk*h]jvr7䠊P싋TsRDyHýSmb`M^f!%uW,Ɖt[㆝.D甆іZTǟ)4> $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 new file mode 100644 index 000000000..7d6d3b9ca --- /dev/null +++ b/test/integration/mergeConflictsFiltered/test.json @@ -0,0 +1,4 @@ +{ + "description": "Verify that when we get merge conflicts we filter out any non-conflicted files", + "speed": 20 +}