diff --git a/.gitignore b/.gitignore index 21ec121da..3e8fd3b92 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,8 @@ lazygit !.github/ test/git_server/data -test/integration_test/ -test/integration_test_config/ +test/integration/*/actual/ +test/integration/*/used_config/ +# these sample hooks waste too space space +test/integration/*/expected/.git_keep/hooks/ +!.git_keep/ diff --git a/pkg/commands/oscommands/copy.go b/pkg/commands/oscommands/copy.go index 2681441c5..131e9bc6b 100644 --- a/pkg/commands/oscommands/copy.go +++ b/pkg/commands/oscommands/copy.go @@ -76,7 +76,7 @@ func CopyFile(src, dst string) (err error) { } // CopyDir recursively copies a directory tree, attempting to preserve permissions. -// Source directory must exist, destination directory must *not* exist. +// Source directory must exist. If destination already exists we'll clobber it. // Symlinks are ignored and skipped. func CopyDir(src string, dst string) (err error) { src = filepath.Clean(src) @@ -95,7 +95,10 @@ func CopyDir(src string, dst string) (err error) { return } if err == nil { - return fmt.Errorf("destination already exists") + // it exists so let's remove it + if err := os.RemoveAll(dst); err != nil { + return err + } } err = os.MkdirAll(dst, si.Mode()) diff --git a/pkg/gui/gui_test.go b/pkg/gui/gui_test.go index ef8ad6dd9..e11151020 100644 --- a/pkg/gui/gui_test.go +++ b/pkg/gui/gui_test.go @@ -81,13 +81,45 @@ func tests() []integrationTest { } } -func generateSnapshot(t *testing.T, actualDir string) string { +func generateSnapshot(t *testing.T, dir string) string { osCommand := oscommands.NewDummyOSCommand() - cmd := fmt.Sprintf(`bash -c "cd %s && git status; cat ./*; git log --pretty=%%B -p"`, actualDir) - // need to copy from current directory to + _, err := os.Stat(filepath.Join(dir, ".git")) + if err != nil { + return "git directory not found" + } + + snapshot := "" + + statusCmd := fmt.Sprintf(`git -C %s status`, dir) + statusCmdOutput, err := osCommand.RunCommandWithOutput(statusCmd) + assert.NoError(t, err) + + snapshot += statusCmdOutput + "\n" + + logCmd := fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir) + logCmdOutput, err := osCommand.RunCommandWithOutput(logCmd) + assert.NoError(t, err) + + snapshot += logCmdOutput + "\n" + + err = filepath.Walk(dir, func(path string, f os.FileInfo, err error) error { + assert.NoError(t, err) + + if f.IsDir() { + if f.Name() == ".git" { + return filepath.SkipDir + } + return nil + } + + bytes, err := ioutil.ReadFile(path) + assert.NoError(t, err) + snapshot += string(bytes) + "\n" + + return nil + }) - snapshot, err := osCommand.RunCommandWithOutput(cmd) assert.NoError(t, err) return snapshot @@ -160,23 +192,46 @@ func Test(t *testing.T) { testPath := filepath.Join(rootDir, "test", "integration", test.name) actualDir := filepath.Join(testPath, "actual") expectedDir := filepath.Join(testPath, "expected") + t.Logf("testPath: %s, actualDir: %s, expectedDir: %s", testPath, actualDir, expectedDir) findOrCreateDir(testPath) - prepareIntegrationTestDir(testPath) + prepareIntegrationTestDir(actualDir) err := createFixture(rootDir, test.fixture, actualDir) assert.NoError(t, err) runLazygit(t, testPath, rootDir, record, speed) - actual := generateSnapshot(t, actualDir) - if updateSnapshots { err = oscommands.CopyDir(actualDir, expectedDir) assert.NoError(t, err) } - expected := generateSnapshot(t, expectedDir) + actual := generateSnapshot(t, actualDir) + + expected := "" + + func() { + // git refuses to track .git folders in subdirectories so we need to rename it + // to git_keep after running a test + + defer func() { + err = os.Rename( + filepath.Join(expectedDir, ".git"), + filepath.Join(expectedDir, ".git_keep"), + ) + + assert.NoError(t, err) + }() + + // ignoring this error because we might not have a .git_keep file here yet. + _ = os.Rename( + filepath.Join(expectedDir, ".git_keep"), + filepath.Join(expectedDir, ".git"), + ) + + expected = generateSnapshot(t, expectedDir) + }() if expected == actual { t.Logf("%s: success at speed %d\n", test.name, speed) @@ -268,7 +323,7 @@ func runLazygit(t *testing.T, testPath string, rootDir string, record bool, spee } // if we're on CI we'll need to use a PTY. We can work that out by seeing if the 'TERM' env is defined. - if runInParallel() { + if runInPTY() { cmd.Env = append(cmd.Env, "TERM=xterm") f, err := pty.StartWithSize(cmd, &pty.Winsize{Rows: 100, Cols: 100}) @@ -286,17 +341,19 @@ func runLazygit(t *testing.T, testPath string, rootDir string, record bool, spee } func runInParallel() bool { - return os.Getenv("PARALLEL") != "" || os.Getenv("TERM") == "" + return os.Getenv("PARALLEL") != "" } -func prepareIntegrationTestDir(testPath string) { - path := filepath.Join(testPath, "actual") +func runInPTY() bool { + return runInParallel() || os.Getenv("TERM") == "" +} +func prepareIntegrationTestDir(actualDir string) { // remove contents of integration test directory - dir, err := ioutil.ReadDir(path) + dir, err := ioutil.ReadDir(actualDir) if err != nil { if os.IsNotExist(err) { - err = os.Mkdir(path, 0777) + err = os.Mkdir(actualDir, 0777) if err != nil { panic(err) } @@ -305,6 +362,6 @@ func prepareIntegrationTestDir(testPath string) { } } for _, d := range dir { - os.RemoveAll(filepath.Join(path, d.Name())) + os.RemoveAll(filepath.Join(actualDir, d.Name())) } } diff --git a/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..fbe803e67 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +my commit diff --git a/test/integration/commit/expected/.git_keep/FETCH_HEAD b/test/integration/commit/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/commit/expected/.git_keep/HEAD b/test/integration/commit/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/commit/expected/.git_keep/config b/test/integration/commit/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/commit/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/commit/expected/.git_keep/description b/test/integration/commit/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/commit/expected/.git_keep/index b/test/integration/commit/expected/.git_keep/index new file mode 100644 index 000000000..cfbb26b72 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/index differ diff --git a/test/integration/commit/expected/.git_keep/info/exclude b/test/integration/commit/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/commit/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/commit/expected/.git_keep/logs/HEAD b/test/integration/commit/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..a61e86c36 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 f4473317f8385f84b8054f3e9e9895870aa339bb CI 1601981250 +1100 commit (initial): myfile1 +f4473317f8385f84b8054f3e9e9895870aa339bb 60100545975af038486a0265a786b78c090faa4c CI 1601981250 +1100 commit: myfile2 +60100545975af038486a0265a786b78c090faa4c 7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 CI 1601981250 +1100 commit: myfile3 +7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 dcb4d7ccb176a17a6ddc2e1a402a28f055947393 CI 1601981250 +1100 commit: myfile4 +dcb4d7ccb176a17a6ddc2e1a402a28f055947393 459260de735f85c64517eef30e6a2d2236f3f920 CI 1601981254 +1100 commit: my commit diff --git a/test/integration/commit/expected/.git_keep/logs/refs/heads/master b/test/integration/commit/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..a61e86c36 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 f4473317f8385f84b8054f3e9e9895870aa339bb CI 1601981250 +1100 commit (initial): myfile1 +f4473317f8385f84b8054f3e9e9895870aa339bb 60100545975af038486a0265a786b78c090faa4c CI 1601981250 +1100 commit: myfile2 +60100545975af038486a0265a786b78c090faa4c 7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 CI 1601981250 +1100 commit: myfile3 +7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 dcb4d7ccb176a17a6ddc2e1a402a28f055947393 CI 1601981250 +1100 commit: myfile4 +dcb4d7ccb176a17a6ddc2e1a402a28f055947393 459260de735f85c64517eef30e6a2d2236f3f920 CI 1601981254 +1100 commit: my commit diff --git a/test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/commit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/commit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 000000000..0a734f981 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce differ diff --git a/test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 000000000..31ae3f5ba Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 differ diff --git a/test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be new file mode 100644 index 000000000..aca754d63 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be differ diff --git a/test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920 b/test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920 new file mode 100644 index 000000000..906c7e190 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920 differ diff --git a/test/integration/commit/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/commit/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f new file mode 100644 index 000000000..953241815 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f differ diff --git a/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c b/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c new file mode 100644 index 000000000..b6365c94e --- /dev/null +++ b/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c @@ -0,0 +1,2 @@ +xM +0@a9Ed7 "tc$ -%[immٟ.bK"%<(GZ#bc4[խz0i4!x%a!'(k5n^.Ҷ\,F@3"91OnW8v9w \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 b/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 new file mode 100644 index 000000000..7359cf0a9 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 @@ -0,0 +1,2 @@ +xM +0F] 2M@DǘN3X0z{sW<OZf1S;JÌ E\;*/@hv8H+|W S`G"'s" =Îӽ|r,H&3鴟jOԯ9 \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 000000000..d39fa7d2f Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 differ diff --git a/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 b/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 new file mode 100644 index 000000000..e288012fb Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 differ diff --git a/test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb b/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb new file mode 100644 index 000000000..156705abb Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb differ diff --git a/test/integration/commit/expected/.git_keep/refs/heads/master b/test/integration/commit/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..0ccfd5d63 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +459260de735f85c64517eef30e6a2d2236f3f920 diff --git a/test/integration/commit/expected/myfile1 b/test/integration/commit/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/commit/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/commit/expected/myfile2 b/test/integration/commit/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/commit/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/commit/expected/myfile3 b/test/integration/commit/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/commit/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/commit/expected/myfile4 b/test/integration/commit/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/commit/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/commit/expected/myfile5 b/test/integration/commit/expected/myfile5 new file mode 100644 index 000000000..4f346f1ad --- /dev/null +++ b/test/integration/commit/expected/myfile5 @@ -0,0 +1 @@ +test5 diff --git a/test/integration/commit/snapshot.txt b/test/integration/commit/snapshot.txt deleted file mode 100644 index 31c1e5553..000000000 --- a/test/integration/commit/snapshot.txt +++ /dev/null @@ -1,57 +0,0 @@ -On branch master -nothing to commit, working tree clean -test1 -test2 -test3 -test4 -test5 -my commit - - -diff --git a/myfile5 b/myfile5 -new file mode 100644 -index 0000000..4f346f1 ---- /dev/null -+++ b/myfile5 -@@ -0,0 +1 @@ -+test5 -myfile4 - - -diff --git a/myfile4 b/myfile4 -new file mode 100644 -index 0000000..d234c5e ---- /dev/null -+++ b/myfile4 -@@ -0,0 +1 @@ -+test4 -myfile3 - - -diff --git a/myfile3 b/myfile3 -new file mode 100644 -index 0000000..df6b0d2 ---- /dev/null -+++ b/myfile3 -@@ -0,0 +1 @@ -+test3 -myfile2 - - -diff --git a/myfile2 b/myfile2 -new file mode 100644 -index 0000000..180cf83 ---- /dev/null -+++ b/myfile2 -@@ -0,0 +1 @@ -+test2 -myfile1 - - -diff --git a/myfile1 b/myfile1 -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/myfile1 -@@ -0,0 +1 @@ -+test1 diff --git a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..e4171df59 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,20 @@ +Merge branch 'base_branch' into other_branch + +# 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/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: +# modified: file +# diff --git a/test/integration/mergeConflicts/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflicts/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/mergeConflicts/expected/.git_keep/HEAD b/test/integration/mergeConflicts/expected/.git_keep/HEAD new file mode 100644 index 000000000..904a2e296 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..431e026e3 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +659aa732ccda1aaa1cd6564fdb93bf0445b5115a diff --git a/test/integration/mergeConflicts/expected/.git_keep/config b/test/integration/mergeConflicts/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/mergeConflicts/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/mergeConflicts/expected/.git_keep/description b/test/integration/mergeConflicts/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/.git_keep/index new file mode 100644 index 000000000..896aa9430 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/index differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/info/exclude b/test/integration/mergeConflicts/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/mergeConflicts/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/mergeConflicts/expected/.git_keep/logs/HEAD b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..5d804ed17 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD @@ -0,0 +1,34 @@ +0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 commit (initial): first commit +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from master to feature/cherry-picking +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year +02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh +f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh +4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool +4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice +223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha +b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah +bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 checkout: moving from feature/cherry-picking to develop +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop +27bff1745d1ab39754071c9b225971867ea2a8a8 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from develop to master +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master +07392b739784503a325278fedf5251ecb7c3bca9 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 checkout: moving from master to develop +27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop +6573f823441ea560245f56e735d7cbc972607341 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 checkout: moving from develop to master +07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master +a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 checkout: moving from master to develop +6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop +de8c7134958792e1bff9b33cca090287def37f7e a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 checkout: moving from develop to master +a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master +d09f332ddbdbb1d516ca99da33b23f987e4c13c3 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 checkout: moving from master to develop +de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop +149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 checkout: moving from develop to master +d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master +e217a1e8fe2e038fdc59202dee120f081ecf458f e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 checkout: moving from master to base_branch +e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file +8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch +8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from other_branch to base_branch +8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed +4a5f9db9c8d46ac099de054e42e17a157ee3909b 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch +8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd +659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch new file mode 100644 index 000000000..383150856 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 branch: Created from HEAD +e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file +8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop new file mode 100644 index 000000000..439b9c700 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 branch: Created from HEAD +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop +27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop +6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop +de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..a61959de7 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 branch: Created from HEAD +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year +02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh +f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh +4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool +4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice +223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha +b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah +bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..427cc86bd --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 commit (initial): first commit +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master +07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master +a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master +d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..4e8ffd4f8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 branch: Created from HEAD +8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd +659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 b/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 new file mode 100644 index 000000000..6a17c763e --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 @@ -0,0 +1,3 @@ +x +0=+.nZD +Jo:ĵk#+ݮU,bD}o{pu\Ь:Vy>) ԱN{$k F_mY+M3 3c#^ltjS7Z~RNh5_$PD \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 b/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 new file mode 100644 index 000000000..46101849d Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d new file mode 100644 index 000000000..8d42c4c9e Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 b/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 new file mode 100644 index 000000000..2a5841f73 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflicts/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 new file mode 100644 index 000000000..25389c9d6 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c new file mode 100644 index 000000000..fd879a5f3 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflicts/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 new file mode 100644 index 000000000..9b8af5fe7 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca new file mode 100644 index 000000000..2b02dc3d1 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b new file mode 100644 index 000000000..fe80a0056 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b @@ -0,0 +1,5 @@ +xK +0@]d&M& ]L`M)=/ܖA9M9%c5Z +UKlZ& +:REr _ &;' \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 new file mode 100644 index 000000000..1cafb95f9 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af new file mode 100644 index 000000000..27c11bb26 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a b/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a new file mode 100644 index 000000000..749db6230 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 new file mode 100644 index 000000000..991774643 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 b/test/integration/mergeConflicts/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 new file mode 100644 index 000000000..6204b1f1d Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/mergeConflicts/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 new file mode 100644 index 000000000..864410e1e Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 b/test/integration/mergeConflicts/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 new file mode 100644 index 000000000..9f053b7ba Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 b/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 new file mode 100644 index 000000000..8ceca065f Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflicts/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 new file mode 100644 index 000000000..ed74cea0a Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflicts/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd new file mode 100644 index 000000000..e8d63bced Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflicts/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c new file mode 100644 index 000000000..394c5a294 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b b/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b new file mode 100644 index 000000000..4a8334d3f --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b @@ -0,0 +1,3 @@ +xK +0@]$ ]db C>ރ'۲ 0K;TB2'bTԘ4Uw$Tԙ=6mh9c +a$T֚*3Ӧa0>7ٖ` Z"ZkNzN5S7u~+Ȕ֗j< \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 new file mode 100644 index 000000000..898b64dad Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a new file mode 100644 index 000000000..d1c02f022 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 new file mode 100644 index 000000000..e0670d284 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 @@ -0,0 +1 @@ +x 0CvL\jVОW=MM%sOlbDTß{9 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d new file mode 100644 index 000000000..d63de558b Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/mergeConflicts/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 new file mode 100644 index 000000000..ea7fa5303 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflicts/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd new file mode 100644 index 000000000..cdd5f8a93 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflicts/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c new file mode 100644 index 000000000..1befd67ac Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 new file mode 100644 index 000000000..ffc277c86 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 new file mode 100644 index 000000000..ead50126a --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 @@ -0,0 +1,2 @@ +xM +0]d&i@DHSLS߀p=R 4"v M2j- g&s*ۣ0Np|R^rZn@)LO5Wp]giPW(FQ? \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c new file mode 100644 index 000000000..7302ca34e Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 b/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 new file mode 100644 index 000000000..daaee9023 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/mergeConflicts/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 new file mode 100644 index 000000000..4aa46eb8c Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 b/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 new file mode 100644 index 000000000..7b80aff0d --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 @@ -0,0 +1,4 @@ +xK +0@]d&i~ "t1&Ʉ +ƖEoo }/ϭ];ht@Ak<&$RSHKѨWwHYeśl)⬡m &CFO +,onMyn' 鈰'BTݦ ~|' > \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 new file mode 100644 index 000000000..008bb1a65 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 new file mode 100644 index 000000000..ab357ec23 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 new file mode 100644 index 000000000..6955a6f9c --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 @@ -0,0 +1,4 @@ +xM +0a9@DǘZ0߂p>ֵtM4%84D]DO6\MXgLC> N +c +.bƚ5F]>\\Vo@)E L8\em3lO:-?/ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 new file mode 100644 index 000000000..198bff1ec Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflicts/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 new file mode 100644 index 000000000..af687b620 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a new file mode 100644 index 000000000..4cf840395 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c new file mode 100644 index 000000000..74c919681 --- /dev/null +++ b/test/integration/mergeConflicts/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/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e b/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e new file mode 100644 index 000000000..a80770449 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e @@ -0,0 +1,2 @@ +xK +0@]d&i@DH)-M Q</Tmi /@p!s$̑))HlGьv2XeoZ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f b/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f new file mode 100644 index 000000000..3ed017b56 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflicts/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e new file mode 100644 index 000000000..3a7ee91ea Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 new file mode 100644 index 000000000..714e20cb7 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflicts/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 new file mode 100644 index 000000000..83998943a Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflicts/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d new file mode 100644 index 000000000..b047d6827 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 new file mode 100644 index 000000000..4992422c7 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 b/test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 new file mode 100644 index 000000000..767d40cea --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 @@ -0,0 +1 @@ +xAJ1E])j7 AR$"¬fRvg< mmwAŐ*Ѣ(iel!Inm"US% !+.%$Q\``$I>:/x<ۗlw{ж=&zD >X3]v]^ hjM߻V \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 new file mode 100644 index 000000000..3688d63f9 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 new file mode 100644 index 000000000..e9f9f0881 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec b/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec new file mode 100644 index 000000000..e829884f3 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec @@ -0,0 +1,2 @@ +xA +0E]d2&M"BW=$P~{Xހ;*7)9'x2U "gr琳dg̒R"m,ٽxkS0pƛy^reP^G8ju?O\3Ou /p\eP9B \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflicts/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 new file mode 100644 index 000000000..168b5c5f9 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch new file mode 100644 index 000000000..11226b7e8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch @@ -0,0 +1 @@ +4a5f9db9c8d46ac099de054e42e17a157ee3909b diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop new file mode 100644 index 000000000..78c028d95 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop @@ -0,0 +1 @@ +149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..d255de7e2 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking @@ -0,0 +1 @@ +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..29c7a8be1 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +e217a1e8fe2e038fdc59202dee120f081ecf458f diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..13d445aa4 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +ed21fe1044b8600683ec6c2abbf86195a4d55461 diff --git a/test/integration/mergeConflicts/expected/directory/file b/test/integration/mergeConflicts/expected/directory/file new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/mergeConflicts/expected/directory/file @@ -0,0 +1 @@ +test3 diff --git a/test/integration/mergeConflicts/expected/directory/file2 b/test/integration/mergeConflicts/expected/directory/file2 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/mergeConflicts/expected/directory/file2 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/mergeConflicts/expected/file b/test/integration/mergeConflicts/expected/file new file mode 100644 index 000000000..173a40ed5 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file @@ -0,0 +1 @@ +new1\noriginal2\noriginal3 diff --git a/test/integration/mergeConflicts/expected/file1 b/test/integration/mergeConflicts/expected/file1 new file mode 100644 index 000000000..dcd348507 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file1 @@ -0,0 +1,63 @@ +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/mergeConflicts/expected/file3 b/test/integration/mergeConflicts/expected/file3 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file3 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflicts/expected/file4 b/test/integration/mergeConflicts/expected/file4 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file4 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflicts/expected/file5 b/test/integration/mergeConflicts/expected/file5 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file5 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflicts/snapshot.txt b/test/integration/mergeConflicts/snapshot.txt deleted file mode 100644 index 64d10d668..000000000 --- a/test/integration/mergeConflicts/snapshot.txt +++ /dev/null @@ -1,241 +0,0 @@ -On branch other_branch -nothing to commit, working tree clean -cat: ./directory: Is a directory -new1\noriginal2\noriginal3 -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 -once upon a time there was a horse -once upon a time there was a horse -once upon a time there was a horse -Merge branch 'base_branch' into other_branch - -asd - - -diff --git a/file b/file -index 5da4d92..2410ee1 100644 ---- a/file -+++ b/file -@@ -1 +1 @@ --original1\noriginal2\noriginal3 -+new2\noriginal2\noriginal3 -file changed - - -diff --git a/file b/file -index 5da4d92..173a40e 100644 ---- a/file -+++ b/file -@@ -1 +1 @@ --original1\noriginal2\noriginal3 -+new1\noriginal2\noriginal3 -file - - -diff --git a/file b/file -new file mode 100644 -index 0000000..5da4d92 ---- /dev/null -+++ b/file -@@ -0,0 +1 @@ -+original1\noriginal2\noriginal3 -fourth commit on master - - -diff --git a/file5 b/file5 -new file mode 100644 -index 0000000..e3ae5c6 ---- /dev/null -+++ b/file5 -@@ -0,0 +1 @@ -+once upon a time there was a horse -third commit on master - - -diff --git a/file4 b/file4 -new file mode 100644 -index 0000000..e3ae5c6 ---- /dev/null -+++ b/file4 -@@ -0,0 +1 @@ -+once upon a time there was a horse -second commit on master - - -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..e3ae5c6 ---- /dev/null -+++ b/file3 -@@ -0,0 +1 @@ -+once upon a time there was a horse -first commit on master - - -diff --git a/directory/file b/directory/file -index a5bce3f..df6b0d2 100644 ---- a/directory/file -+++ b/directory/file -@@ -1 +1 @@ --test1 -+test3 -diff --git a/directory/file2 b/directory/file2 -index a5bce3f..df6b0d2 100644 ---- a/directory/file2 -+++ b/directory/file2 -@@ -1 +1 @@ --test1 -+test3 -diff --git a/file1 b/file1 -index 88c39cd..dcd3485 100644 ---- a/file1 -+++ b/file1 -@@ -1 +1,63 @@ - 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 -first commit - - -diff --git a/directory/file b/directory/file -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/directory/file -@@ -0,0 +1 @@ -+test1 -diff --git a/directory/file2 b/directory/file2 -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/directory/file2 -@@ -0,0 +1 @@ -+test1 -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..88c39cd ---- /dev/null -+++ b/file1 -@@ -0,0 +1 @@ -+Here is a story that has been told throuhg the ages diff --git a/test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/patchBuilding/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuilding/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/patchBuilding/expected/.git_keep/HEAD b/test/integration/patchBuilding/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..b4ae72d05 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +84166fe7febd3d82c087a5261a34a5e0dabeebbc diff --git a/test/integration/patchBuilding/expected/.git_keep/config b/test/integration/patchBuilding/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/patchBuilding/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/patchBuilding/expected/.git_keep/description b/test/integration/patchBuilding/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/patchBuilding/expected/.git_keep/index b/test/integration/patchBuilding/expected/.git_keep/index new file mode 100644 index 000000000..2a202a2bd Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/index differ diff --git a/test/integration/patchBuilding/expected/.git_keep/info/exclude b/test/integration/patchBuilding/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/patchBuilding/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/patchBuilding/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..beea0368f --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 19c35a6c6e60aead9beb704c336f95a9c34eb272 CI 1601981264 +1100 commit (initial): myfile1 +19c35a6c6e60aead9beb704c336f95a9c34eb272 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981264 +1100 commit: myfile2 +2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981264 +1100 commit: myfile2 update +84166fe7febd3d82c087a5261a34a5e0dabeebbc abe7653e9667153c8086f477217f8fb571731132 CI 1601981264 +1100 commit: myfile3 +abe7653e9667153c8086f477217f8fb571731132 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981269 +1100 rebase -i (start): checkout 2322f6373956d9d54470640e71ff258d609c61bd +2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981269 +1100 rebase -i: fast-forward +84166fe7febd3d82c087a5261a34a5e0dabeebbc ac3b4dc17422ff4d64f08195e8d6fae5f61d213f CI 1601981270 +1100 commit (amend): myfile2 update +ac3b4dc17422ff4d64f08195e8d6fae5f61d213f a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (pick): myfile3 +a296781a25a5bd97a0024744488d9ba39189bf19 a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (finish): returning to refs/heads/master +a296781a25a5bd97a0024744488d9ba39189bf19 51d06e68d1780c3af5ec14e8a8a6250693dea430 CI 1601981271 +1100 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..e30bae310 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 19c35a6c6e60aead9beb704c336f95a9c34eb272 CI 1601981264 +1100 commit (initial): myfile1 +19c35a6c6e60aead9beb704c336f95a9c34eb272 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981264 +1100 commit: myfile2 +2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981264 +1100 commit: myfile2 update +84166fe7febd3d82c087a5261a34a5e0dabeebbc abe7653e9667153c8086f477217f8fb571731132 CI 1601981264 +1100 commit: myfile3 +abe7653e9667153c8086f477217f8fb571731132 a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (finish): refs/heads/master onto 2322f6373956d9d54470640e71ff258d609c61bd +a296781a25a5bd97a0024744488d9ba39189bf19 51d06e68d1780c3af5ec14e8a8a6250693dea430 CI 1601981271 +1100 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 b/test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 new file mode 100644 index 000000000..4854085f4 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/19/c35a6c6e60aead9beb704c336f95a9c34eb272 b/test/integration/patchBuilding/expected/.git_keep/objects/19/c35a6c6e60aead9beb704c336f95a9c34eb272 new file mode 100644 index 000000000..354216f85 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/19/c35a6c6e60aead9beb704c336f95a9c34eb272 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd b/test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd new file mode 100644 index 000000000..b65def31c Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 b/test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 new file mode 100644 index 000000000..5b95c0039 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/51/d06e68d1780c3af5ec14e8a8a6250693dea430 b/test/integration/patchBuilding/expected/.git_keep/objects/51/d06e68d1780c3af5ec14e8a8a6250693dea430 new file mode 100644 index 000000000..41bf442f1 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/51/d06e68d1780c3af5ec14e8a8a6250693dea430 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 b/test/integration/patchBuilding/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 new file mode 100644 index 000000000..13e90a967 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/84/166fe7febd3d82c087a5261a34a5e0dabeebbc b/test/integration/patchBuilding/expected/.git_keep/objects/84/166fe7febd3d82c087a5261a34a5e0dabeebbc new file mode 100644 index 000000000..8fd7f1798 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/84/166fe7febd3d82c087a5261a34a5e0dabeebbc differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 b/test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 new file mode 100644 index 000000000..449805fe8 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 b/test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 new file mode 100644 index 000000000..60be6d230 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 b/test/integration/patchBuilding/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 new file mode 100644 index 000000000..e75108b14 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/patchBuilding/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 b/test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 new file mode 100644 index 000000000..0f1f37286 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f b/test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f new file mode 100644 index 000000000..30cb044bf Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 b/test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 new file mode 100644 index 000000000..4b5b62ee9 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 b/test/integration/patchBuilding/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 new file mode 100644 index 000000000..d42bbeb9a Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/patchBuilding/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 b/test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 new file mode 100644 index 000000000..a71694532 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a b/test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a new file mode 100644 index 000000000..50c8c7bdc Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a differ diff --git a/test/integration/patchBuilding/expected/.git_keep/refs/heads/master b/test/integration/patchBuilding/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..7dc7e1d23 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +51d06e68d1780c3af5ec14e8a8a6250693dea430 diff --git a/test/integration/patchBuilding/expected/myfile1 b/test/integration/patchBuilding/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/patchBuilding/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/patchBuilding/expected/myfile2 b/test/integration/patchBuilding/expected/myfile2 new file mode 100644 index 000000000..528636756 --- /dev/null +++ b/test/integration/patchBuilding/expected/myfile2 @@ -0,0 +1,3 @@ +firstline2 +secondline +thirdline2 diff --git a/test/integration/patchBuilding/expected/myfile3 b/test/integration/patchBuilding/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/patchBuilding/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/patchBuilding/snapshot.txt b/test/integration/patchBuilding/snapshot.txt deleted file mode 100644 index 7b2fc0690..000000000 --- a/test/integration/patchBuilding/snapshot.txt +++ /dev/null @@ -1,63 +0,0 @@ -On branch master -nothing to commit, working tree clean -test1 -firstline2 -secondline -thirdline2 -test3 -test - - -diff --git a/myfile2 b/myfile2 -index 475a06b..5286367 100644 ---- a/myfile2 -+++ b/myfile2 -@@ -1,3 +1,3 @@ --firstline -+firstline2 - secondline - thirdline2 -myfile3 - - -diff --git a/myfile3 b/myfile3 -new file mode 100644 -index 0000000..df6b0d2 ---- /dev/null -+++ b/myfile3 -@@ -0,0 +1 @@ -+test3 -myfile2 update - - -diff --git a/myfile2 b/myfile2 -index f3c8a07..475a06b 100644 ---- a/myfile2 -+++ b/myfile2 -@@ -1,3 +1,3 @@ - firstline - secondline --thirdline -+thirdline2 -myfile2 - - -diff --git a/myfile2 b/myfile2 -new file mode 100644 -index 0000000..f3c8a07 ---- /dev/null -+++ b/myfile2 -@@ -0,0 +1,3 @@ -+firstline -+secondline -+thirdline -myfile1 - - -diff --git a/myfile1 b/myfile1 -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/myfile1 -@@ -0,0 +1 @@ -+test1 diff --git a/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..d72af3146 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuilding2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/patchBuilding2/expected/.git_keep/HEAD b/test/integration/patchBuilding2/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..48f86a0be --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 diff --git a/test/integration/patchBuilding2/expected/.git_keep/config b/test/integration/patchBuilding2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/patchBuilding2/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/patchBuilding2/expected/.git_keep/description b/test/integration/patchBuilding2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/patchBuilding2/expected/.git_keep/index b/test/integration/patchBuilding2/expected/.git_keep/index new file mode 100644 index 000000000..ea7ff9d65 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/index differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/info/exclude b/test/integration/patchBuilding2/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/patchBuilding2/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/patchBuilding2/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..7bd0ac678 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 CI 1601981272 +1100 commit (initial): myfile1 +e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981272 +1100 commit: myfile2 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 8dd7331351a6d2b809cbab136a83f8c69abb0b4d CI 1601981272 +1100 commit: myfile2 update +8dd7331351a6d2b809cbab136a83f8c69abb0b4d 01287c3b620e4e8db2cef27436347eb4a92e0d56 CI 1601981272 +1100 commit: myfile3 +01287c3b620e4e8db2cef27436347eb4a92e0d56 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981275 +1100 reset: moving to eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981278 +1100 reset: moving to HEAD +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 d015c882b061d63669daf4b25c918c8155d88c66 CI 1601981288 +1100 commit: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..319c6e78e --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 CI 1601981272 +1100 commit (initial): myfile1 +e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981272 +1100 commit: myfile2 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 8dd7331351a6d2b809cbab136a83f8c69abb0b4d CI 1601981272 +1100 commit: myfile2 update +8dd7331351a6d2b809cbab136a83f8c69abb0b4d 01287c3b620e4e8db2cef27436347eb4a92e0d56 CI 1601981272 +1100 commit: myfile3 +01287c3b620e4e8db2cef27436347eb4a92e0d56 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981275 +1100 reset: moving to eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 d015c882b061d63669daf4b25c918c8155d88c66 CI 1601981288 +1100 commit: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..f0e954b6c --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f0e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e CI 1601981278 +1100 On master: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 b/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 new file mode 100644 index 000000000..feb982d86 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 b/test/integration/patchBuilding2/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 new file mode 100644 index 000000000..13e90a967 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba b/test/integration/patchBuilding2/expected/.git_keep/objects/5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba new file mode 100644 index 000000000..3d57ba22d Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/60/39f2c23e9f10c8b11e82639bdceafb795ec7ab b/test/integration/patchBuilding2/expected/.git_keep/objects/60/39f2c23e9f10c8b11e82639bdceafb795ec7ab new file mode 100644 index 000000000..fccf5e02e Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/60/39f2c23e9f10c8b11e82639bdceafb795ec7ab differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/8d/d7331351a6d2b809cbab136a83f8c69abb0b4d b/test/integration/patchBuilding2/expected/.git_keep/objects/8d/d7331351a6d2b809cbab136a83f8c69abb0b4d new file mode 100644 index 000000000..ed3a9ccf6 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/8d/d7331351a6d2b809cbab136a83f8c69abb0b4d differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 b/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 new file mode 100644 index 000000000..449805fe8 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 b/test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 new file mode 100644 index 000000000..e75108b14 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/patchBuilding2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 b/test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 new file mode 100644 index 000000000..4b5b62ee9 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 b/test/integration/patchBuilding2/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 new file mode 100644 index 000000000..d42bbeb9a Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/d0/15c882b061d63669daf4b25c918c8155d88c66 b/test/integration/patchBuilding2/expected/.git_keep/objects/d0/15c882b061d63669daf4b25c918c8155d88c66 new file mode 100644 index 000000000..b4840ded9 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/d0/15c882b061d63669daf4b25c918c8155d88c66 @@ -0,0 +1,3 @@ +xA +0@Q9E$Ic2`l<=[|]Z{tg8LDi&U, +1 K!Df Rf) cj\9d |}88+m}IvȀ!gDp{ݧɝ*8x \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/patchBuilding2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 b/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 new file mode 100644 index 000000000..5452038f9 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 b/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 new file mode 100644 index 000000000..ab2a044f3 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e b/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e new file mode 100644 index 000000000..b18a466b8 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e @@ -0,0 +1,2 @@ +x=j1@{ a7` \ ш"Y{i_tg673PCRE%I *9(-_nu2McТ6 ʍ 1601981300 +1100 commit (initial): myfile1 +c353473bb2ef43d48a78ed053bc2e1f280e37215 56a707665291bb59eff01a7c25f14c3e9ad9a28d CI 1601981300 +1100 commit: myfile2 +56a707665291bb59eff01a7c25f14c3e9ad9a28d e0f0a11e4de3f37f143b508c0084a4d58a672afc CI 1601981300 +1100 commit: myfile3 +e0f0a11e4de3f37f143b508c0084a4d58a672afc f612cb91eecb4ccf9e47dfda31ca63ab700d5383 CI 1601981300 +1100 commit: myfile4 +f612cb91eecb4ccf9e47dfda31ca63ab700d5383 c353473bb2ef43d48a78ed053bc2e1f280e37215 CI 1601981304 +1100 rebase -i (start): checkout c353473bb2ef43d48a78ed053bc2e1f280e37215 +c353473bb2ef43d48a78ed053bc2e1f280e37215 b5551403e8d2c3d141e8b4523e4b9892337fec8a CI 1601981304 +1100 rebase -i (pick): myfile3 +b5551403e8d2c3d141e8b4523e4b9892337fec8a cee4caccdc4fcfb3e69d54981c466bcb5ee50037 CI 1601981304 +1100 rebase -i (pick): myfile4 +cee4caccdc4fcfb3e69d54981c466bcb5ee50037 cee4caccdc4fcfb3e69d54981c466bcb5ee50037 CI 1601981304 +1100 rebase -i (finish): returning to refs/heads/master +cee4caccdc4fcfb3e69d54981c466bcb5ee50037 b5551403e8d2c3d141e8b4523e4b9892337fec8a CI 1601981305 +1100 reset: moving to b5551403e8d2c3d141e8b4523e4b9892337fec8a +b5551403e8d2c3d141e8b4523e4b9892337fec8a fc34f28ab77f236452f97c9cf8fdfe687d23938e CI 1601981309 +1100 commit: test diff --git a/test/integration/searching/expected/.git_keep/logs/refs/heads/master b/test/integration/searching/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..f7c404f2f --- /dev/null +++ b/test/integration/searching/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 c353473bb2ef43d48a78ed053bc2e1f280e37215 CI 1601981300 +1100 commit (initial): myfile1 +c353473bb2ef43d48a78ed053bc2e1f280e37215 56a707665291bb59eff01a7c25f14c3e9ad9a28d CI 1601981300 +1100 commit: myfile2 +56a707665291bb59eff01a7c25f14c3e9ad9a28d e0f0a11e4de3f37f143b508c0084a4d58a672afc CI 1601981300 +1100 commit: myfile3 +e0f0a11e4de3f37f143b508c0084a4d58a672afc f612cb91eecb4ccf9e47dfda31ca63ab700d5383 CI 1601981300 +1100 commit: myfile4 +f612cb91eecb4ccf9e47dfda31ca63ab700d5383 cee4caccdc4fcfb3e69d54981c466bcb5ee50037 CI 1601981304 +1100 rebase -i (finish): refs/heads/master onto c353473bb2ef43d48a78ed053bc2e1f280e37215 +cee4caccdc4fcfb3e69d54981c466bcb5ee50037 b5551403e8d2c3d141e8b4523e4b9892337fec8a CI 1601981305 +1100 reset: moving to b5551403e8d2c3d141e8b4523e4b9892337fec8a +b5551403e8d2c3d141e8b4523e4b9892337fec8a fc34f28ab77f236452f97c9cf8fdfe687d23938e CI 1601981309 +1100 commit: test diff --git a/test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/searching/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/searching/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/searching/expected/.git_keep/objects/29/cfbab279d8677b1614786c8161d915c3851334 b/test/integration/searching/expected/.git_keep/objects/29/cfbab279d8677b1614786c8161d915c3851334 new file mode 100644 index 000000000..b1e421f48 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/29/cfbab279d8677b1614786c8161d915c3851334 differ diff --git a/test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 000000000..0a734f981 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce differ diff --git a/test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 000000000..31ae3f5ba Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 differ diff --git a/test/integration/searching/expected/.git_keep/objects/35/98e6458e34f1a1c51ffbbc3f9073b8dd4694eb b/test/integration/searching/expected/.git_keep/objects/35/98e6458e34f1a1c51ffbbc3f9073b8dd4694eb new file mode 100644 index 000000000..f76a4a716 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/35/98e6458e34f1a1c51ffbbc3f9073b8dd4694eb differ diff --git a/test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f new file mode 100644 index 000000000..953241815 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f differ diff --git a/test/integration/searching/expected/.git_keep/objects/56/a707665291bb59eff01a7c25f14c3e9ad9a28d b/test/integration/searching/expected/.git_keep/objects/56/a707665291bb59eff01a7c25f14c3e9ad9a28d new file mode 100644 index 000000000..eacaba80a Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/56/a707665291bb59eff01a7c25f14c3e9ad9a28d differ diff --git a/test/integration/searching/expected/.git_keep/objects/8e/4d1c97ee8e375b218257ed805954c4508f188a b/test/integration/searching/expected/.git_keep/objects/8e/4d1c97ee8e375b218257ed805954c4508f188a new file mode 100644 index 000000000..994454933 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/8e/4d1c97ee8e375b218257ed805954c4508f188a differ diff --git a/test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/searching/expected/.git_keep/objects/b5/551403e8d2c3d141e8b4523e4b9892337fec8a b/test/integration/searching/expected/.git_keep/objects/b5/551403e8d2c3d141e8b4523e4b9892337fec8a new file mode 100644 index 000000000..a0bd3ebd6 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/b5/551403e8d2c3d141e8b4523e4b9892337fec8a differ diff --git a/test/integration/searching/expected/.git_keep/objects/c3/53473bb2ef43d48a78ed053bc2e1f280e37215 b/test/integration/searching/expected/.git_keep/objects/c3/53473bb2ef43d48a78ed053bc2e1f280e37215 new file mode 100644 index 000000000..82dbc0f03 --- /dev/null +++ b/test/integration/searching/expected/.git_keep/objects/c3/53473bb2ef43d48a78ed053bc2e1f280e37215 @@ -0,0 +1,2 @@ +xA +@ @QsIژNADHg2Xh)#~TrjI* l%G YhvAYwfM>.HH="QI?yoY7-, \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 b/test/integration/searching/expected/.git_keep/objects/ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 new file mode 100644 index 000000000..df4785246 --- /dev/null +++ b/test/integration/searching/expected/.git_keep/objects/ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 @@ -0,0 +1,2 @@ +xM +0@a9Ed:vDzLR"½ǷxiunNmW腵'ϊT @PJ #LF]F=C%@wC&&c88%fw =8gzL5MyQ2_m: \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 000000000..d39fa7d2f Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 differ diff --git a/test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/searching/expected/.git_keep/objects/e0/f0a11e4de3f37f143b508c0084a4d58a672afc b/test/integration/searching/expected/.git_keep/objects/e0/f0a11e4de3f37f143b508c0084a4d58a672afc new file mode 100644 index 000000000..e7b54c63c Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/e0/f0a11e4de3f37f143b508c0084a4d58a672afc differ diff --git a/test/integration/searching/expected/.git_keep/objects/f6/12cb91eecb4ccf9e47dfda31ca63ab700d5383 b/test/integration/searching/expected/.git_keep/objects/f6/12cb91eecb4ccf9e47dfda31ca63ab700d5383 new file mode 100644 index 000000000..4b8dfa4fd Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/f6/12cb91eecb4ccf9e47dfda31ca63ab700d5383 differ diff --git a/test/integration/searching/expected/.git_keep/objects/fc/34f28ab77f236452f97c9cf8fdfe687d23938e b/test/integration/searching/expected/.git_keep/objects/fc/34f28ab77f236452f97c9cf8fdfe687d23938e new file mode 100644 index 000000000..9fa03c396 Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/fc/34f28ab77f236452f97c9cf8fdfe687d23938e differ diff --git a/test/integration/searching/expected/.git_keep/refs/heads/master b/test/integration/searching/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..10dcea73e --- /dev/null +++ b/test/integration/searching/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +fc34f28ab77f236452f97c9cf8fdfe687d23938e diff --git a/test/integration/searching/expected/myfile1 b/test/integration/searching/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/searching/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/searching/expected/myfile3 b/test/integration/searching/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/searching/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/searching/expected/myfile5 b/test/integration/searching/expected/myfile5 new file mode 100644 index 000000000..4f346f1ad --- /dev/null +++ b/test/integration/searching/expected/myfile5 @@ -0,0 +1 @@ +test5 diff --git a/test/integration/searching/snapshot.txt b/test/integration/searching/snapshot.txt deleted file mode 100644 index 98a108787..000000000 --- a/test/integration/searching/snapshot.txt +++ /dev/null @@ -1,35 +0,0 @@ -On branch master -nothing to commit, working tree clean -test1 -test3 -test5 -test - - -diff --git a/myfile5 b/myfile5 -new file mode 100644 -index 0000000..4f346f1 ---- /dev/null -+++ b/myfile5 -@@ -0,0 +1 @@ -+test5 -myfile3 - - -diff --git a/myfile3 b/myfile3 -new file mode 100644 -index 0000000..df6b0d2 ---- /dev/null -+++ b/myfile3 -@@ -0,0 +1 @@ -+test3 -myfile1 - - -diff --git a/myfile1 b/myfile1 -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/myfile1 -@@ -0,0 +1 @@ -+test1 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/COMMIT_EDITMSG b/test/integration/searchingInStagingPanel/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/FETCH_HEAD b/test/integration/searchingInStagingPanel/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/HEAD b/test/integration/searchingInStagingPanel/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/config b/test/integration/searchingInStagingPanel/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/searchingInStagingPanel/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/searchingInStagingPanel/expected/.git_keep/description b/test/integration/searchingInStagingPanel/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/index b/test/integration/searchingInStagingPanel/expected/.git_keep/index new file mode 100644 index 000000000..2929ccdb1 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/index differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/info/exclude b/test/integration/searchingInStagingPanel/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/searchingInStagingPanel/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/searchingInStagingPanel/expected/.git_keep/logs/HEAD b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..adae1350f --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 f2214a28aa9be25c7bf34dc84aa98059728db102 CI 1601981310 +1100 commit (initial): myfile1 +f2214a28aa9be25c7bf34dc84aa98059728db102 0264611003567cbe3b08955a8e745786c688ec7a CI 1601981321 +1100 commit: one +0264611003567cbe3b08955a8e745786c688ec7a 5f82960be010ac424ab7485684942813aff754e8 CI 1601981324 +1100 commit: test diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..adae1350f --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 f2214a28aa9be25c7bf34dc84aa98059728db102 CI 1601981310 +1100 commit (initial): myfile1 +f2214a28aa9be25c7bf34dc84aa98059728db102 0264611003567cbe3b08955a8e745786c688ec7a CI 1601981321 +1100 commit: one +0264611003567cbe3b08955a8e745786c688ec7a 5f82960be010ac424ab7485684942813aff754e8 CI 1601981324 +1100 commit: test diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/02/64611003567cbe3b08955a8e745786c688ec7a b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/02/64611003567cbe3b08955a8e745786c688ec7a new file mode 100644 index 000000000..e5102bd0d --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/02/64611003567cbe3b08955a8e745786c688ec7a @@ -0,0 +1,2 @@ +xA + @Ѯ=BQU1NFZ1 =~sn?o\jC.$B|(AW>bD.G>@[SdNY˘V9>׌@?;/v~oIw0E'7mS){9 \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 new file mode 100644 index 000000000..c64d709a0 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 new file mode 100644 index 000000000..6fb186172 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/5f/82960be010ac424ab7485684942813aff754e8 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/5f/82960be010ac424ab7485684942813aff754e8 new file mode 100644 index 000000000..34e42c965 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/5f/82960be010ac424ab7485684942813aff754e8 differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/6b/f2cc26256f2eae6ed4058ce1bc924b84a560f0 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/6b/f2cc26256f2eae6ed4058ce1bc924b84a560f0 new file mode 100644 index 000000000..d961cc170 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/6b/f2cc26256f2eae6ed4058ce1bc924b84a560f0 differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/7b/ba8c8e64b598d317cdf1bb8a63278f9fc241b1 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/7b/ba8c8e64b598d317cdf1bb8a63278f9fc241b1 new file mode 100644 index 000000000..b94e36206 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/7b/ba8c8e64b598d317cdf1bb8a63278f9fc241b1 differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 new file mode 100644 index 000000000..ba7181154 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf new file mode 100644 index 000000000..80eb62ee3 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/f2/214a28aa9be25c7bf34dc84aa98059728db102 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/f2/214a28aa9be25c7bf34dc84aa98059728db102 new file mode 100644 index 000000000..f9446bf2c --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/f2/214a28aa9be25c7bf34dc84aa98059728db102 @@ -0,0 +1,4 @@ +xA +0Fa9?M +"BW=ƘLАR">>xպtN}W%2ۜ]D-"-!pRˮ<$g_mi4?#u[ZtQI?߲ +=, \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..c9d519ec1 --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +5f82960be010ac424ab7485684942813aff754e8 diff --git a/test/integration/searchingInStagingPanel/expected/myfile1 b/test/integration/searchingInStagingPanel/expected/myfile1 new file mode 100644 index 000000000..a92d664bc --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/myfile1 @@ -0,0 +1,3 @@ +line 1 +line 2 +line 3 diff --git a/test/integration/searchingInStagingPanel/snapshot.txt b/test/integration/searchingInStagingPanel/snapshot.txt deleted file mode 100644 index 281d5ffca..000000000 --- a/test/integration/searchingInStagingPanel/snapshot.txt +++ /dev/null @@ -1,36 +0,0 @@ -On branch master -nothing to commit, working tree clean -line 1 -line 2 -line 3 -test - - -diff --git a/myfile1 b/myfile1 -index 7bba8c8..a92d664 100644 ---- a/myfile1 -+++ b/myfile1 -@@ -1,2 +1,3 @@ - line 1 - line 2 -+line 3 -one - - -diff --git a/myfile1 b/myfile1 -index 89b24ec..7bba8c8 100644 ---- a/myfile1 -+++ b/myfile1 -@@ -1 +1,2 @@ - line 1 -+line 2 -myfile1 - - -diff --git a/myfile1 b/myfile1 -new file mode 100644 -index 0000000..89b24ec ---- /dev/null -+++ b/myfile1 -@@ -0,0 +1 @@ -+line 1 diff --git a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..01a9c0330 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,30 @@ +# This is a combination of 3 commits. +# This is the 1st commit message: + +myfile2 + +# This is the commit message #2: + +myfile3 + +# The commit message #3 will be skipped: + +# myfile5 + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Date: Tue Oct 6 21:47:36 2020 +1100 +# +# interactive rebase in progress; onto 0c6aed6 +# Last commands done (4 commands done): +# drop 35bf029 myfile4 +# fixup 51a88ed myfile5 +# No commands remaining. +# You are currently rebasing branch 'master' on '0c6aed6'. +# +# Changes to be committed: +# new file: myfile2 +# new file: myfile3 +# new file: myfile5 +# diff --git a/test/integration/squash/expected/.git_keep/FETCH_HEAD b/test/integration/squash/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/squash/expected/.git_keep/HEAD b/test/integration/squash/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/squash/expected/.git_keep/ORIG_HEAD b/test/integration/squash/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..93c77382b --- /dev/null +++ b/test/integration/squash/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ac0b81af0c436000141d41d6bfbf61fe41567eca diff --git a/test/integration/squash/expected/.git_keep/config b/test/integration/squash/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/squash/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/squash/expected/.git_keep/description b/test/integration/squash/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/squash/expected/.git_keep/index b/test/integration/squash/expected/.git_keep/index new file mode 100644 index 000000000..c94c1469c Binary files /dev/null and b/test/integration/squash/expected/.git_keep/index differ diff --git a/test/integration/squash/expected/.git_keep/info/exclude b/test/integration/squash/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/squash/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/squash/expected/.git_keep/logs/HEAD b/test/integration/squash/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..7d1bab2af --- /dev/null +++ b/test/integration/squash/expected/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981256 +1100 commit (initial): myfile1 +0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981256 +1100 commit: myfile2 +ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI 1601981256 +1100 commit: myfile3 +db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI 1601981256 +1100 commit: myfile4 +35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI 1601981256 +1100 commit: myfile5 +51a88edd955132342caad6512e92d25164b5f7d3 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981258 +1100 rebase -i (start): checkout 0c6aed66ccd076086011a0e68bf67e3477cd5e1d +0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981258 +1100 rebase -i: fast-forward +ac0b81af0c436000141d41d6bfbf61fe41567eca 75afa841946755c424097363ba4e5682951b02e3 CI 1601981262 +1100 rebase -i (squash): # This is a combination of 2 commits. +75afa841946755c424097363ba4e5682951b02e3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (fixup): myfile2 +5ef618ee84d1fbb6f277996061996ce5ec0faf4e 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/squash/expected/.git_keep/logs/refs/heads/master b/test/integration/squash/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..adbf39bb5 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981256 +1100 commit (initial): myfile1 +0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981256 +1100 commit: myfile2 +ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI 1601981256 +1100 commit: myfile3 +db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI 1601981256 +1100 commit: myfile4 +35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI 1601981256 +1100 commit: myfile5 +51a88edd955132342caad6512e92d25164b5f7d3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (finish): refs/heads/master onto 0c6aed66ccd076086011a0e68bf67e3477cd5e1d diff --git a/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d b/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d new file mode 100644 index 000000000..16d75b6d3 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d differ diff --git a/test/integration/squash/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/squash/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/squash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/squash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 b/test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 new file mode 100644 index 000000000..45934b124 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 differ diff --git a/test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 000000000..0a734f981 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce differ diff --git a/test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 000000000..31ae3f5ba Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 differ diff --git a/test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be new file mode 100644 index 000000000..aca754d63 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be differ diff --git a/test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680 b/test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680 new file mode 100644 index 000000000..9568aedfa Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680 differ diff --git a/test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f new file mode 100644 index 000000000..953241815 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f differ diff --git a/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 b/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 new file mode 100644 index 000000000..faddde627 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 @@ -0,0 +1,2 @@ +xK +0@] 2ɯ "tcL [Jnkks8SE4cfkLƺsMRŰ%J65T 15a!'%GPu㤯t7mK^M"@ڧ΋8:' \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e b/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e new file mode 100644 index 000000000..871b5bdc9 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e @@ -0,0 +1,3 @@ +x}A +0E] 2Ӵ)] ƖAoo]{|އ'K)s S