diff --git a/.gitignore b/.gitignore index ea0475b55..f20638ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ lazygit.exe test/git_server/data test/integration/*/actual/ -test/integration/*/actual_remote/ test/integration/*/used_config/ # these sample hooks waste too much space test/integration/*/expected/**/hooks/ diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go index ed1c0fe42..3edc44939 100644 --- a/pkg/integration/integration.go +++ b/pkg/integration/integration.go @@ -13,6 +13,7 @@ import ( "strings" "testing" + "github.com/jesseduffield/generics/slices" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/secureexec" ) @@ -97,11 +98,9 @@ func RunTests( speeds := getTestSpeeds(test.Speed, mode, speedEnv) testPath := filepath.Join(testDir, test.Name) - actualRepoDir := filepath.Join(testPath, "actual") - expectedRepoDir := filepath.Join(testPath, "expected") - actualRemoteDir := filepath.Join(testPath, "actual_remote") - expectedRemoteDir := filepath.Join(testPath, "expected_remote") - otherRepoDir := filepath.Join(testPath, "other_repo") + actualDir := filepath.Join(testPath, "actual") + expectedDir := filepath.Join(testPath, "expected") + actualRepoDir := filepath.Join(actualDir, "repo") logf("path: %s", testPath) for i, speed := range speeds { @@ -110,9 +109,8 @@ func RunTests( } findOrCreateDir(testPath) - prepareIntegrationTestDir(actualRepoDir) - removeDir(otherRepoDir) - removeDir(actualRemoteDir) + prepareIntegrationTestDir(actualDir) + findOrCreateDir(actualRepoDir) err := createFixture(testPath, actualRepoDir) if err != nil { return err @@ -130,72 +128,66 @@ func RunTests( return err } - // submodule tests currently make use of a repo called 'other_repo' but we don't want that - // to stick around. Long-term we should have an 'actual' folder which itself contains - // repos, and there we can put the 'repo' repo which is the main one, alongside - // any others that we use as part of the test (including remotes). Then we'll do snapshots for - // each of them. - removeDir(otherRepoDir) - if mode == UPDATE_SNAPSHOT || mode == RECORD { // create/update snapshot - err = oscommands.CopyDir(actualRepoDir, expectedRepoDir) + err = oscommands.CopyDir(actualDir, expectedDir) if err != nil { return err } - if err := renameGitDirs(expectedRepoDir); err != nil { + if err := renameGitDirs(expectedDir); err != nil { return err } - // see if we have a remote dir and if so, copy it over. Otherwise, delete the expected dir because we have no remote folder. - if folderExists(actualRemoteDir) { - err = oscommands.CopyDir(actualRemoteDir, expectedRemoteDir) - if err != nil { - return err - } - } else { - removeDir(expectedRemoteDir) - } - logf("%s", "updated snapshot") } else { - // compare result to snapshot - actualRepo, expectedRepo, err := generateSnapshots(actualRepoDir, expectedRepoDir) + if err := validateSameRepos(expectedDir, actualDir); err != nil { + return err + } + + // iterate through each repo in the expected dir and comparet to the corresponding repo in the actual dir + expectedFiles, err := ioutil.ReadDir(expectedDir) if err != nil { return err } - actualRemote := "remote folder does not exist" - expectedRemote := "remote folder does not exist" - if folderExists(expectedRemoteDir) { - actualRemote, expectedRemote, err = generateSnapshotsForRemote(actualRemoteDir, expectedRemoteDir) + success := true + for _, f := range expectedFiles { + if !f.IsDir() { + return errors.New("unexpected file (as opposed to directory) in integration test 'expected' directory") + } + + // get corresponding file name from actual dir + actualRepoPath := filepath.Join(actualDir, f.Name()) + expectedRepoPath := filepath.Join(expectedDir, f.Name()) + + actualRepo, expectedRepo, err := generateSnapshots(actualRepoPath, expectedRepoPath) if err != nil { return err } - } else if folderExists(actualRemoteDir) { - actualRemote = "remote folder exists" + + if expectedRepo != actualRepo { + success = false + // if the snapshot doesn't match and we haven't tried all playback speeds different we'll retry at a slower speed + if i < len(speeds)-1 { + break + } + + // get the log file and print it + bytes, err := ioutil.ReadFile(filepath.Join(configDir, "development.log")) + if err != nil { + return err + } + logf("%s", string(bytes)) + + onFail(t, expectedRepo, actualRepo, f.Name()) + } } - if expectedRepo == actualRepo && expectedRemote == actualRemote { + if success { logf("%s: success at speed %f\n", test.Name, speed) break } - - // if the snapshot doesn't match and we haven't tried all playback speeds different we'll retry at a slower speed - if i == len(speeds)-1 { - // get the log file and print that - bytes, err := ioutil.ReadFile(filepath.Join(configDir, "development.log")) - if err != nil { - return err - } - logf("%s", string(bytes)) - if expectedRepo != actualRepo { - onFail(t, expectedRepo, actualRepo, "repo") - } else { - onFail(t, expectedRemote, actualRemote, "remote") - } - } } } @@ -206,11 +198,31 @@ func RunTests( return nil } -func removeDir(dir string) { - err := os.RemoveAll(dir) +// validates that the actual and expected dirs have the same repo names (doesn't actually check the contents of the repos) +func validateSameRepos(expectedDir string, actualDir string) error { + // iterate through each repo in the expected dir and comparet to the corresponding repo in the actual dir + expectedFiles, err := ioutil.ReadDir(expectedDir) if err != nil { - panic(err) + return err } + + var actualFiles []os.FileInfo + actualFiles, err = ioutil.ReadDir(actualDir) + if err != nil { + return err + } + + expectedFileNames := slices.Map(expectedFiles, getFileName) + actualFileNames := slices.Map(actualFiles, getFileName) + if !slices.Equal(expectedFileNames, actualFileNames) { + return fmt.Errorf("expected and actual repo dirs do not match: expected: %s, actual: %s", expectedFileNames, actualFileNames) + } + + return nil +} + +func getFileName(f os.FileInfo) string { + return f.Name() } func prepareIntegrationTestDir(actualDir string) { @@ -357,7 +369,9 @@ func generateSnapshot(dir string) (string, error) { snapshot := "" cmdStrs := []string{ - `remote show -n origin`, // remote branches + `remote show -n origin`, // remote branches + // TOOD: find a way to bring this back without breaking tests + // `ls-remote origin`, `status`, // file tree `log --pretty=%B -p -1`, // log `tag -n`, // tags @@ -493,26 +507,12 @@ func restoreGitDirs(dir string) error { return nil } -func generateSnapshotsForRemote(actualDir string, expectedDir string) (string, string, error) { - actual, err := generateSnapshot(actualDir) - if err != nil { - return "", "", err - } - - expected, err := generateSnapshot(expectedDir) - if err != nil { - return "", "", err - } - - return actual, expected, nil -} - func getLazygitCommand(testPath string, rootDir string, mode Mode, speed float64, extraCmdArgs string) (*exec.Cmd, error) { osCommand := oscommands.NewDummyOSCommand() replayPath := filepath.Join(testPath, "recording.json") templateConfigDir := filepath.Join(rootDir, "test", "default_test_config") - actualDir := filepath.Join(testPath, "actual") + actualRepoDir := filepath.Join(testPath, "actual", "repo") exists, err := osCommand.FileExists(filepath.Join(testPath, "config")) if err != nil { @@ -534,7 +534,7 @@ func getLazygitCommand(testPath string, rootDir string, mode Mode, speed float64 return nil, err } - cmdStr := fmt.Sprintf("%s -debug --use-config-dir=%s --path=%s %s", tempLazygitPath(), configDir, actualDir, extraCmdArgs) + cmdStr := fmt.Sprintf("%s -debug --use-config-dir=%s --path=%s %s", tempLazygitPath(), configDir, actualRepoDir, extraCmdArgs) cmdObj := osCommand.Cmd.New(cmdStr) cmdObj.AddEnvVars(fmt.Sprintf("SPEED=%f", speed)) @@ -548,8 +548,3 @@ func getLazygitCommand(testPath string, rootDir string, mode Mode, speed float64 return cmdObj.GetCmd(), nil } - -func folderExists(path string) bool { - _, err := os.Stat(path) - return err == nil -} diff --git a/test/hooks/pre-push b/test/hooks/pre-push index b7cb2e87b..3b758c1b1 100644 --- a/test/hooks/pre-push +++ b/test/hooks/pre-push @@ -14,6 +14,8 @@ echo -n "Username for 'github': " read username echo -n "Password for 'github': " +# this will print the password to the log view but real git won't do that. +# We could use read -s but that's not POSIX compliant. read password if [ "$username" = "username" -a "$password" = "password" ]; then diff --git a/test/integration/bisect/expected/.git_keep/BISECT_ANCESTORS_OK b/test/integration/bisect/expected/repo/.git_keep/BISECT_ANCESTORS_OK similarity index 100% rename from test/integration/bisect/expected/.git_keep/BISECT_ANCESTORS_OK rename to test/integration/bisect/expected/repo/.git_keep/BISECT_ANCESTORS_OK diff --git a/test/integration/bisect/expected/.git_keep/BISECT_EXPECTED_REV b/test/integration/bisect/expected/repo/.git_keep/BISECT_EXPECTED_REV similarity index 100% rename from test/integration/bisect/expected/.git_keep/BISECT_EXPECTED_REV rename to test/integration/bisect/expected/repo/.git_keep/BISECT_EXPECTED_REV diff --git a/test/integration/bisect/expected/.git_keep/BISECT_LOG b/test/integration/bisect/expected/repo/.git_keep/BISECT_LOG similarity index 100% rename from test/integration/bisect/expected/.git_keep/BISECT_LOG rename to test/integration/bisect/expected/repo/.git_keep/BISECT_LOG diff --git a/test/integration/bisect/expected/.git_keep/BISECT_NAMES b/test/integration/bisect/expected/repo/.git_keep/BISECT_NAMES similarity index 100% rename from test/integration/bisect/expected/.git_keep/BISECT_NAMES rename to test/integration/bisect/expected/repo/.git_keep/BISECT_NAMES diff --git a/test/integration/bisect/expected/.git_keep/BISECT_START b/test/integration/bisect/expected/repo/.git_keep/BISECT_START similarity index 100% rename from test/integration/bisect/expected/.git_keep/BISECT_START rename to test/integration/bisect/expected/repo/.git_keep/BISECT_START diff --git a/test/integration/bisect/expected/.git_keep/BISECT_TERMS b/test/integration/bisect/expected/repo/.git_keep/BISECT_TERMS similarity index 100% rename from test/integration/bisect/expected/.git_keep/BISECT_TERMS rename to test/integration/bisect/expected/repo/.git_keep/BISECT_TERMS diff --git a/test/integration/bisect/expected/.git_keep/COMMIT_EDITMSG b/test/integration/bisect/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/bisect/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/bisect/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/bisect/expected/.git_keep/FETCH_HEAD b/test/integration/bisect/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/bisect/expected/.git_keep/FETCH_HEAD rename to test/integration/bisect/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/bisect/expected/.git_keep/HEAD b/test/integration/bisect/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/bisect/expected/.git_keep/HEAD rename to test/integration/bisect/expected/repo/.git_keep/HEAD diff --git a/test/integration/bisect/expected/.git_keep/config b/test/integration/bisect/expected/repo/.git_keep/config similarity index 100% rename from test/integration/bisect/expected/.git_keep/config rename to test/integration/bisect/expected/repo/.git_keep/config diff --git a/test/integration/bisect/expected/.git_keep/description b/test/integration/bisect/expected/repo/.git_keep/description similarity index 100% rename from test/integration/bisect/expected/.git_keep/description rename to test/integration/bisect/expected/repo/.git_keep/description diff --git a/test/integration/bisect/expected/.git_keep/index b/test/integration/bisect/expected/repo/.git_keep/index similarity index 100% rename from test/integration/bisect/expected/.git_keep/index rename to test/integration/bisect/expected/repo/.git_keep/index diff --git a/test/integration/bisect/expected/.git_keep/info/exclude b/test/integration/bisect/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/bisect/expected/.git_keep/info/exclude rename to test/integration/bisect/expected/repo/.git_keep/info/exclude diff --git a/test/integration/bisect/expected/.git_keep/logs/HEAD b/test/integration/bisect/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/bisect/expected/.git_keep/logs/HEAD rename to test/integration/bisect/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/bisect/expected/.git_keep/logs/refs/heads/master b/test/integration/bisect/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/bisect/expected/.git_keep/logs/refs/heads/master rename to test/integration/bisect/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/bisect/expected/.git_keep/logs/refs/heads/test b/test/integration/bisect/expected/repo/.git_keep/logs/refs/heads/test similarity index 100% rename from test/integration/bisect/expected/.git_keep/logs/refs/heads/test rename to test/integration/bisect/expected/repo/.git_keep/logs/refs/heads/test diff --git a/test/integration/bisect/expected/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 b/test/integration/bisect/expected/repo/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 rename to test/integration/bisect/expected/repo/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 diff --git a/test/integration/bisect/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba b/test/integration/bisect/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba rename to test/integration/bisect/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba diff --git a/test/integration/bisect/expected/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f b/test/integration/bisect/expected/repo/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f rename to test/integration/bisect/expected/repo/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f diff --git a/test/integration/bisect/expected/.git_keep/objects/07/552205114379b7c1abd7cb39575cb7a30a2e8c b/test/integration/bisect/expected/repo/.git_keep/objects/07/552205114379b7c1abd7cb39575cb7a30a2e8c similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/07/552205114379b7c1abd7cb39575cb7a30a2e8c rename to test/integration/bisect/expected/repo/.git_keep/objects/07/552205114379b7c1abd7cb39575cb7a30a2e8c diff --git a/test/integration/bisect/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f b/test/integration/bisect/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f rename to test/integration/bisect/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f diff --git a/test/integration/bisect/expected/.git_keep/objects/11/0046b8d92b877def6cda61639cf8f37bc2829c b/test/integration/bisect/expected/repo/.git_keep/objects/11/0046b8d92b877def6cda61639cf8f37bc2829c similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/11/0046b8d92b877def6cda61639cf8f37bc2829c rename to test/integration/bisect/expected/repo/.git_keep/objects/11/0046b8d92b877def6cda61639cf8f37bc2829c diff --git a/test/integration/bisect/expected/.git_keep/objects/12/e46e3c37d1a43a26b909a346ecd2d97677c641 b/test/integration/bisect/expected/repo/.git_keep/objects/12/e46e3c37d1a43a26b909a346ecd2d97677c641 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/12/e46e3c37d1a43a26b909a346ecd2d97677c641 rename to test/integration/bisect/expected/repo/.git_keep/objects/12/e46e3c37d1a43a26b909a346ecd2d97677c641 diff --git a/test/integration/bisect/expected/.git_keep/objects/1b/01733c2b372c7b5544c7f2293c3b7341824112 b/test/integration/bisect/expected/repo/.git_keep/objects/1b/01733c2b372c7b5544c7f2293c3b7341824112 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/1b/01733c2b372c7b5544c7f2293c3b7341824112 rename to test/integration/bisect/expected/repo/.git_keep/objects/1b/01733c2b372c7b5544c7f2293c3b7341824112 diff --git a/test/integration/bisect/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 b/test/integration/bisect/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 rename to test/integration/bisect/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 diff --git a/test/integration/bisect/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 b/test/integration/bisect/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 rename to test/integration/bisect/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 diff --git a/test/integration/bisect/expected/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5 b/test/integration/bisect/expected/repo/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5 rename to test/integration/bisect/expected/repo/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5 diff --git a/test/integration/bisect/expected/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 b/test/integration/bisect/expected/repo/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 rename to test/integration/bisect/expected/repo/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 diff --git a/test/integration/bisect/expected/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 b/test/integration/bisect/expected/repo/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 rename to test/integration/bisect/expected/repo/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 diff --git a/test/integration/bisect/expected/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 b/test/integration/bisect/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 rename to test/integration/bisect/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 diff --git a/test/integration/bisect/expected/.git_keep/objects/3e/02ce90348f3386128ebb2972515fb1a3788818 b/test/integration/bisect/expected/repo/.git_keep/objects/3e/02ce90348f3386128ebb2972515fb1a3788818 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/3e/02ce90348f3386128ebb2972515fb1a3788818 rename to test/integration/bisect/expected/repo/.git_keep/objects/3e/02ce90348f3386128ebb2972515fb1a3788818 diff --git a/test/integration/bisect/expected/.git_keep/objects/3f/f8b0f3820fd2eb3da53a5b803f94caf30dc2ab b/test/integration/bisect/expected/repo/.git_keep/objects/3f/f8b0f3820fd2eb3da53a5b803f94caf30dc2ab similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/3f/f8b0f3820fd2eb3da53a5b803f94caf30dc2ab rename to test/integration/bisect/expected/repo/.git_keep/objects/3f/f8b0f3820fd2eb3da53a5b803f94caf30dc2ab diff --git a/test/integration/bisect/expected/.git_keep/objects/43/78c740dfa0de7a973216b54b99c45a3c03f83c b/test/integration/bisect/expected/repo/.git_keep/objects/43/78c740dfa0de7a973216b54b99c45a3c03f83c similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/43/78c740dfa0de7a973216b54b99c45a3c03f83c rename to test/integration/bisect/expected/repo/.git_keep/objects/43/78c740dfa0de7a973216b54b99c45a3c03f83c diff --git a/test/integration/bisect/expected/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf b/test/integration/bisect/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf rename to test/integration/bisect/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf diff --git a/test/integration/bisect/expected/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094 b/test/integration/bisect/expected/repo/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094 rename to test/integration/bisect/expected/repo/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094 diff --git a/test/integration/bisect/expected/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b b/test/integration/bisect/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b rename to test/integration/bisect/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b diff --git a/test/integration/bisect/expected/.git_keep/objects/4b/65d66c089cd4f6bfa69dff2d7ba4c27337cd23 b/test/integration/bisect/expected/repo/.git_keep/objects/4b/65d66c089cd4f6bfa69dff2d7ba4c27337cd23 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/4b/65d66c089cd4f6bfa69dff2d7ba4c27337cd23 rename to test/integration/bisect/expected/repo/.git_keep/objects/4b/65d66c089cd4f6bfa69dff2d7ba4c27337cd23 diff --git a/test/integration/bisect/expected/.git_keep/objects/54/3c0ef66d928051f16f8b9d7d33d6c4ea1f4e4f b/test/integration/bisect/expected/repo/.git_keep/objects/54/3c0ef66d928051f16f8b9d7d33d6c4ea1f4e4f similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/54/3c0ef66d928051f16f8b9d7d33d6c4ea1f4e4f rename to test/integration/bisect/expected/repo/.git_keep/objects/54/3c0ef66d928051f16f8b9d7d33d6c4ea1f4e4f diff --git a/test/integration/bisect/expected/.git_keep/objects/5f/9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 b/test/integration/bisect/expected/repo/.git_keep/objects/5f/9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/5f/9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 rename to test/integration/bisect/expected/repo/.git_keep/objects/5f/9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 diff --git a/test/integration/bisect/expected/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 b/test/integration/bisect/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 rename to test/integration/bisect/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 diff --git a/test/integration/bisect/expected/.git_keep/objects/66/19c0a1a3eb6449eb15ce6cd0916fec0e410c10 b/test/integration/bisect/expected/repo/.git_keep/objects/66/19c0a1a3eb6449eb15ce6cd0916fec0e410c10 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/66/19c0a1a3eb6449eb15ce6cd0916fec0e410c10 rename to test/integration/bisect/expected/repo/.git_keep/objects/66/19c0a1a3eb6449eb15ce6cd0916fec0e410c10 diff --git a/test/integration/bisect/expected/.git_keep/objects/67/fbfb3b74c2381ad1e058949231f2b4f0c8921f b/test/integration/bisect/expected/repo/.git_keep/objects/67/fbfb3b74c2381ad1e058949231f2b4f0c8921f similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/67/fbfb3b74c2381ad1e058949231f2b4f0c8921f rename to test/integration/bisect/expected/repo/.git_keep/objects/67/fbfb3b74c2381ad1e058949231f2b4f0c8921f diff --git a/test/integration/bisect/expected/.git_keep/objects/78/d41b2abbd2f52c1ebf2f496268a915d59eb27b b/test/integration/bisect/expected/repo/.git_keep/objects/78/d41b2abbd2f52c1ebf2f496268a915d59eb27b similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/78/d41b2abbd2f52c1ebf2f496268a915d59eb27b rename to test/integration/bisect/expected/repo/.git_keep/objects/78/d41b2abbd2f52c1ebf2f496268a915d59eb27b diff --git a/test/integration/bisect/expected/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 b/test/integration/bisect/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 rename to test/integration/bisect/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 diff --git a/test/integration/bisect/expected/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 b/test/integration/bisect/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 rename to test/integration/bisect/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 diff --git a/test/integration/bisect/expected/.git_keep/objects/80/eeef1a7c49b376f3373ea26c6ba44d69d90d9c b/test/integration/bisect/expected/repo/.git_keep/objects/80/eeef1a7c49b376f3373ea26c6ba44d69d90d9c similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/80/eeef1a7c49b376f3373ea26c6ba44d69d90d9c rename to test/integration/bisect/expected/repo/.git_keep/objects/80/eeef1a7c49b376f3373ea26c6ba44d69d90d9c diff --git a/test/integration/bisect/expected/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 b/test/integration/bisect/expected/repo/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 rename to test/integration/bisect/expected/repo/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 diff --git a/test/integration/bisect/expected/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 b/test/integration/bisect/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 rename to test/integration/bisect/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 diff --git a/test/integration/bisect/expected/.git_keep/objects/91/36f315e5952043f1e7ecdc0d28c208eaeaed71 b/test/integration/bisect/expected/repo/.git_keep/objects/91/36f315e5952043f1e7ecdc0d28c208eaeaed71 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/91/36f315e5952043f1e7ecdc0d28c208eaeaed71 rename to test/integration/bisect/expected/repo/.git_keep/objects/91/36f315e5952043f1e7ecdc0d28c208eaeaed71 diff --git a/test/integration/bisect/expected/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d b/test/integration/bisect/expected/repo/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d rename to test/integration/bisect/expected/repo/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d diff --git a/test/integration/bisect/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d b/test/integration/bisect/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d rename to test/integration/bisect/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d diff --git a/test/integration/bisect/expected/.git_keep/objects/ae/95e9aa3b8881aedb7a526c86ec5d60f371ca6c b/test/integration/bisect/expected/repo/.git_keep/objects/ae/95e9aa3b8881aedb7a526c86ec5d60f371ca6c similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/ae/95e9aa3b8881aedb7a526c86ec5d60f371ca6c rename to test/integration/bisect/expected/repo/.git_keep/objects/ae/95e9aa3b8881aedb7a526c86ec5d60f371ca6c diff --git a/test/integration/bisect/expected/.git_keep/objects/af/f6316148f1524977997c486bcfe624c9094c4e b/test/integration/bisect/expected/repo/.git_keep/objects/af/f6316148f1524977997c486bcfe624c9094c4e similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/af/f6316148f1524977997c486bcfe624c9094c4e rename to test/integration/bisect/expected/repo/.git_keep/objects/af/f6316148f1524977997c486bcfe624c9094c4e diff --git a/test/integration/bisect/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e b/test/integration/bisect/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e rename to test/integration/bisect/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e diff --git a/test/integration/bisect/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 b/test/integration/bisect/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 rename to test/integration/bisect/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 diff --git a/test/integration/bisect/expected/.git_keep/objects/b5/31696093a6482eca9ad4bcab63407172225b93 b/test/integration/bisect/expected/repo/.git_keep/objects/b5/31696093a6482eca9ad4bcab63407172225b93 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/b5/31696093a6482eca9ad4bcab63407172225b93 rename to test/integration/bisect/expected/repo/.git_keep/objects/b5/31696093a6482eca9ad4bcab63407172225b93 diff --git a/test/integration/bisect/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 b/test/integration/bisect/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 rename to test/integration/bisect/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 diff --git a/test/integration/bisect/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad b/test/integration/bisect/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad rename to test/integration/bisect/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad diff --git a/test/integration/bisect/expected/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b b/test/integration/bisect/expected/repo/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b rename to test/integration/bisect/expected/repo/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b diff --git a/test/integration/bisect/expected/.git_keep/objects/ba/8e7277a0ee7cdf84cd5c6138057adb85947a90 b/test/integration/bisect/expected/repo/.git_keep/objects/ba/8e7277a0ee7cdf84cd5c6138057adb85947a90 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/ba/8e7277a0ee7cdf84cd5c6138057adb85947a90 rename to test/integration/bisect/expected/repo/.git_keep/objects/ba/8e7277a0ee7cdf84cd5c6138057adb85947a90 diff --git a/test/integration/bisect/expected/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 b/test/integration/bisect/expected/repo/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 rename to test/integration/bisect/expected/repo/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 diff --git a/test/integration/bisect/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d b/test/integration/bisect/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d rename to test/integration/bisect/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d diff --git a/test/integration/bisect/expected/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c b/test/integration/bisect/expected/repo/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c rename to test/integration/bisect/expected/repo/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c diff --git a/test/integration/bisect/expected/.git_keep/objects/d5/42aa84743f8ba1380358d4009408f03dbfb247 b/test/integration/bisect/expected/repo/.git_keep/objects/d5/42aa84743f8ba1380358d4009408f03dbfb247 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/d5/42aa84743f8ba1380358d4009408f03dbfb247 rename to test/integration/bisect/expected/repo/.git_keep/objects/d5/42aa84743f8ba1380358d4009408f03dbfb247 diff --git a/test/integration/bisect/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 b/test/integration/bisect/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 rename to test/integration/bisect/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 diff --git a/test/integration/bisect/expected/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 b/test/integration/bisect/expected/repo/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 rename to test/integration/bisect/expected/repo/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 diff --git a/test/integration/bisect/expected/.git_keep/objects/d9/cc608eedd5d2cc63c262272b7a0f6ab6aed5dd b/test/integration/bisect/expected/repo/.git_keep/objects/d9/cc608eedd5d2cc63c262272b7a0f6ab6aed5dd similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/d9/cc608eedd5d2cc63c262272b7a0f6ab6aed5dd rename to test/integration/bisect/expected/repo/.git_keep/objects/d9/cc608eedd5d2cc63c262272b7a0f6ab6aed5dd diff --git a/test/integration/bisect/expected/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 b/test/integration/bisect/expected/repo/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 rename to test/integration/bisect/expected/repo/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 diff --git a/test/integration/bisect/expected/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b b/test/integration/bisect/expected/repo/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b rename to test/integration/bisect/expected/repo/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b diff --git a/test/integration/bisect/expected/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a b/test/integration/bisect/expected/repo/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a rename to test/integration/bisect/expected/repo/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a diff --git a/test/integration/bisect/expected/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad b/test/integration/bisect/expected/repo/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad rename to test/integration/bisect/expected/repo/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad diff --git a/test/integration/bisect/expected/.git_keep/objects/ea/684d3f868c358400465f2ec16a640c319ea6a3 b/test/integration/bisect/expected/repo/.git_keep/objects/ea/684d3f868c358400465f2ec16a640c319ea6a3 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/ea/684d3f868c358400465f2ec16a640c319ea6a3 rename to test/integration/bisect/expected/repo/.git_keep/objects/ea/684d3f868c358400465f2ec16a640c319ea6a3 diff --git a/test/integration/bisect/expected/.git_keep/objects/eb/e59a71e9750e75fb983f241687cdf7f0c8ce94 b/test/integration/bisect/expected/repo/.git_keep/objects/eb/e59a71e9750e75fb983f241687cdf7f0c8ce94 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/eb/e59a71e9750e75fb983f241687cdf7f0c8ce94 rename to test/integration/bisect/expected/repo/.git_keep/objects/eb/e59a71e9750e75fb983f241687cdf7f0c8ce94 diff --git a/test/integration/bisect/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 b/test/integration/bisect/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 rename to test/integration/bisect/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 diff --git a/test/integration/bisect/expected/.git_keep/objects/f2/7c6ae26adb8396d3861976ba268f87ad8afa0b b/test/integration/bisect/expected/repo/.git_keep/objects/f2/7c6ae26adb8396d3861976ba268f87ad8afa0b similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/f2/7c6ae26adb8396d3861976ba268f87ad8afa0b rename to test/integration/bisect/expected/repo/.git_keep/objects/f2/7c6ae26adb8396d3861976ba268f87ad8afa0b diff --git a/test/integration/bisect/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 b/test/integration/bisect/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 similarity index 100% rename from test/integration/bisect/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 rename to test/integration/bisect/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 diff --git a/test/integration/bisect/expected/.git_keep/packed-refs b/test/integration/bisect/expected/repo/.git_keep/packed-refs similarity index 100% rename from test/integration/bisect/expected/.git_keep/packed-refs rename to test/integration/bisect/expected/repo/.git_keep/packed-refs diff --git a/test/integration/bisect/expected/.git_keep/refs/bisect/bad b/test/integration/bisect/expected/repo/.git_keep/refs/bisect/bad similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/bisect/bad rename to test/integration/bisect/expected/repo/.git_keep/refs/bisect/bad diff --git a/test/integration/bisect/expected/.git_keep/refs/bisect/good-39983ea412adebe6c5a3d4451a7673cf0962c472 b/test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-39983ea412adebe6c5a3d4451a7673cf0962c472 similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/bisect/good-39983ea412adebe6c5a3d4451a7673cf0962c472 rename to test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-39983ea412adebe6c5a3d4451a7673cf0962c472 diff --git a/test/integration/bisect/expected/.git_keep/refs/bisect/good-67fbfb3b74c2381ad1e058949231f2b4f0c8921f b/test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-67fbfb3b74c2381ad1e058949231f2b4f0c8921f similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/bisect/good-67fbfb3b74c2381ad1e058949231f2b4f0c8921f rename to test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-67fbfb3b74c2381ad1e058949231f2b4f0c8921f diff --git a/test/integration/bisect/expected/.git_keep/refs/bisect/good-e927f0f9467e772eea36f24053c9b534303b106a b/test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-e927f0f9467e772eea36f24053c9b534303b106a similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/bisect/good-e927f0f9467e772eea36f24053c9b534303b106a rename to test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-e927f0f9467e772eea36f24053c9b534303b106a diff --git a/test/integration/bisect/expected/.git_keep/refs/bisect/good-e9d2f825e793bc9ac2be698348dbe669bad34cad b/test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-e9d2f825e793bc9ac2be698348dbe669bad34cad similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/bisect/good-e9d2f825e793bc9ac2be698348dbe669bad34cad rename to test/integration/bisect/expected/repo/.git_keep/refs/bisect/good-e9d2f825e793bc9ac2be698348dbe669bad34cad diff --git a/test/integration/bisect/expected/.git_keep/refs/bisect/skip-bc21c8fabc28201fab6c60503168ecda25ad8626 b/test/integration/bisect/expected/repo/.git_keep/refs/bisect/skip-bc21c8fabc28201fab6c60503168ecda25ad8626 similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/bisect/skip-bc21c8fabc28201fab6c60503168ecda25ad8626 rename to test/integration/bisect/expected/repo/.git_keep/refs/bisect/skip-bc21c8fabc28201fab6c60503168ecda25ad8626 diff --git a/test/integration/bisect/expected/.git_keep/refs/bisect/skip-d1f7a85555fe6f10dd44754d35459ae741cb107c b/test/integration/bisect/expected/repo/.git_keep/refs/bisect/skip-d1f7a85555fe6f10dd44754d35459ae741cb107c similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/bisect/skip-d1f7a85555fe6f10dd44754d35459ae741cb107c rename to test/integration/bisect/expected/repo/.git_keep/refs/bisect/skip-d1f7a85555fe6f10dd44754d35459ae741cb107c diff --git a/test/integration/bisect/expected/.git_keep/refs/heads/master b/test/integration/bisect/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/heads/master rename to test/integration/bisect/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/bisect/expected/.git_keep/refs/heads/test b/test/integration/bisect/expected/repo/.git_keep/refs/heads/test similarity index 100% rename from test/integration/bisect/expected/.git_keep/refs/heads/test rename to test/integration/bisect/expected/repo/.git_keep/refs/heads/test diff --git a/test/integration/bisect/expected/file b/test/integration/bisect/expected/repo/file similarity index 100% rename from test/integration/bisect/expected/file rename to test/integration/bisect/expected/repo/file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_ANCESTORS_OK b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_ANCESTORS_OK similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_ANCESTORS_OK rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_ANCESTORS_OK diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_EXPECTED_REV similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_EXPECTED_REV diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_LOG similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_LOG diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_NAMES similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_NAMES diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_START similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_START diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_TERMS similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_TERMS diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/FETCH_HEAD b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/FETCH_HEAD rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/HEAD diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/config b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/config similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/config rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/config diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/description b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/description similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/description rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/description diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/index b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/index similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/index rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/index diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/info/exclude diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/other similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/other diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/test similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/test diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/packed-refs b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/packed-refs similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/packed-refs rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/packed-refs diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/bad similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/bad diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/other similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/other diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/test similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test rename to test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/test diff --git a/test/integration/bisectFromOtherBranch/expected/myfile b/test/integration/bisectFromOtherBranch/expected/repo/myfile similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/myfile rename to test/integration/bisectFromOtherBranch/expected/repo/myfile diff --git a/test/integration/branchAutocomplete/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchAutocomplete/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/branchAutocomplete/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/branchAutocomplete/expected/.git_keep/FETCH_HEAD b/test/integration/branchAutocomplete/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/FETCH_HEAD rename to test/integration/branchAutocomplete/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/HEAD b/test/integration/branchAutocomplete/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/HEAD rename to test/integration/branchAutocomplete/expected/repo/.git_keep/HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/config b/test/integration/branchAutocomplete/expected/repo/.git_keep/config similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/config rename to test/integration/branchAutocomplete/expected/repo/.git_keep/config diff --git a/test/integration/branchAutocomplete/expected/.git_keep/description b/test/integration/branchAutocomplete/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/description rename to test/integration/branchAutocomplete/expected/repo/.git_keep/description diff --git a/test/integration/branchAutocomplete/expected/.git_keep/index b/test/integration/branchAutocomplete/expected/repo/.git_keep/index similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/index rename to test/integration/branchAutocomplete/expected/repo/.git_keep/index diff --git a/test/integration/branchAutocomplete/expected/.git_keep/info/exclude b/test/integration/branchAutocomplete/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/info/exclude rename to test/integration/branchAutocomplete/expected/repo/.git_keep/info/exclude diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD b/test/integration/branchAutocomplete/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD rename to test/integration/branchAutocomplete/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four b/test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/four similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four rename to test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/four diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master b/test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master rename to test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one b/test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/one similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one rename to test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/one diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three b/test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/three similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three rename to test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/three diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two b/test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/two similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two rename to test/integration/branchAutocomplete/expected/repo/.git_keep/logs/refs/heads/two diff --git a/test/integration/branchAutocomplete/expected/.git_keep/objects/b4/9fda1c7a9af6a4f0b6b07a2cb31aecb8c01a6c b/test/integration/branchAutocomplete/expected/repo/.git_keep/objects/b4/9fda1c7a9af6a4f0b6b07a2cb31aecb8c01a6c similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/objects/b4/9fda1c7a9af6a4f0b6b07a2cb31aecb8c01a6c rename to test/integration/branchAutocomplete/expected/repo/.git_keep/objects/b4/9fda1c7a9af6a4f0b6b07a2cb31aecb8c01a6c diff --git a/test/integration/branchAutocomplete/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/branchAutocomplete/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 rename to test/integration/branchAutocomplete/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d b/test/integration/branchAutocomplete/expected/repo/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d rename to test/integration/branchAutocomplete/expected/repo/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four b/test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/four similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four rename to test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/four diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master b/test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master rename to test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one b/test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/one similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one rename to test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/one diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three b/test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/three similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three rename to test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/three diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two b/test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/two similarity index 100% rename from test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two rename to test/integration/branchAutocomplete/expected/repo/.git_keep/refs/heads/two diff --git a/test/integration/branchAutocomplete/expected/myfile.txt b/test/integration/branchAutocomplete/expected/repo/myfile.txt similarity index 100% rename from test/integration/branchAutocomplete/expected/myfile.txt rename to test/integration/branchAutocomplete/expected/repo/myfile.txt diff --git a/test/integration/branchDelete/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchDelete/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/branchDelete/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/branchDelete/expected/.git_keep/FETCH_HEAD b/test/integration/branchDelete/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/FETCH_HEAD rename to test/integration/branchDelete/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/branchDelete/expected/.git_keep/HEAD b/test/integration/branchDelete/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/HEAD rename to test/integration/branchDelete/expected/repo/.git_keep/HEAD diff --git a/test/integration/branchDelete/expected/.git_keep/config b/test/integration/branchDelete/expected/repo/.git_keep/config similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/config rename to test/integration/branchDelete/expected/repo/.git_keep/config diff --git a/test/integration/branchDelete/expected/.git_keep/description b/test/integration/branchDelete/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/description rename to test/integration/branchDelete/expected/repo/.git_keep/description diff --git a/test/integration/branchDelete/expected/.git_keep/index b/test/integration/branchDelete/expected/repo/.git_keep/index similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/index rename to test/integration/branchDelete/expected/repo/.git_keep/index diff --git a/test/integration/branchDelete/expected/.git_keep/info/exclude b/test/integration/branchDelete/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/info/exclude rename to test/integration/branchDelete/expected/repo/.git_keep/info/exclude diff --git a/test/integration/branchDelete/expected/.git_keep/logs/HEAD b/test/integration/branchDelete/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/logs/HEAD rename to test/integration/branchDelete/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/branchDelete/expected/.git_keep/logs/refs/heads/master b/test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/logs/refs/heads/master rename to test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/branchDelete/expected/.git_keep/logs/refs/heads/new-branch b/test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/new-branch similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/logs/refs/heads/new-branch rename to test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/new-branch diff --git a/test/integration/branchDelete/expected/.git_keep/logs/refs/heads/new-branch-2 b/test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/new-branch-2 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/logs/refs/heads/new-branch-2 rename to test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/new-branch-2 diff --git a/test/integration/branchDelete/expected/.git_keep/logs/refs/heads/new-branch-3 b/test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/new-branch-3 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/logs/refs/heads/new-branch-3 rename to test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/new-branch-3 diff --git a/test/integration/branchDelete/expected/.git_keep/logs/refs/heads/old-branch b/test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/old-branch similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/logs/refs/heads/old-branch rename to test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/old-branch diff --git a/test/integration/branchDelete/expected/.git_keep/logs/refs/heads/old-branch-3 b/test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/old-branch-3 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/logs/refs/heads/old-branch-3 rename to test/integration/branchDelete/expected/repo/.git_keep/logs/refs/heads/old-branch-3 diff --git a/test/integration/branchDelete/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/branchDelete/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/branchDelete/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/branchDelete/expected/.git_keep/objects/21/b436d66d2c515ad17285e53d9e6380d599b044 b/test/integration/branchDelete/expected/repo/.git_keep/objects/21/b436d66d2c515ad17285e53d9e6380d599b044 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/objects/21/b436d66d2c515ad17285e53d9e6380d599b044 rename to test/integration/branchDelete/expected/repo/.git_keep/objects/21/b436d66d2c515ad17285e53d9e6380d599b044 diff --git a/test/integration/branchDelete/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/branchDelete/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/branchDelete/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/branchDelete/expected/.git_keep/refs/heads/master b/test/integration/branchDelete/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/refs/heads/master rename to test/integration/branchDelete/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/branchDelete/expected/.git_keep/refs/heads/new-branch b/test/integration/branchDelete/expected/repo/.git_keep/refs/heads/new-branch similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/refs/heads/new-branch rename to test/integration/branchDelete/expected/repo/.git_keep/refs/heads/new-branch diff --git a/test/integration/branchDelete/expected/.git_keep/refs/heads/new-branch-2 b/test/integration/branchDelete/expected/repo/.git_keep/refs/heads/new-branch-2 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/refs/heads/new-branch-2 rename to test/integration/branchDelete/expected/repo/.git_keep/refs/heads/new-branch-2 diff --git a/test/integration/branchDelete/expected/.git_keep/refs/heads/new-branch-3 b/test/integration/branchDelete/expected/repo/.git_keep/refs/heads/new-branch-3 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/refs/heads/new-branch-3 rename to test/integration/branchDelete/expected/repo/.git_keep/refs/heads/new-branch-3 diff --git a/test/integration/branchDelete/expected/.git_keep/refs/heads/old-branch b/test/integration/branchDelete/expected/repo/.git_keep/refs/heads/old-branch similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/refs/heads/old-branch rename to test/integration/branchDelete/expected/repo/.git_keep/refs/heads/old-branch diff --git a/test/integration/branchDelete/expected/.git_keep/refs/heads/old-branch-3 b/test/integration/branchDelete/expected/repo/.git_keep/refs/heads/old-branch-3 similarity index 100% rename from test/integration/branchDelete/expected/.git_keep/refs/heads/old-branch-3 rename to test/integration/branchDelete/expected/repo/.git_keep/refs/heads/old-branch-3 diff --git a/test/integration/branchDelete/expected/file0 b/test/integration/branchDelete/expected/repo/file0 similarity index 100% rename from test/integration/branchDelete/expected/file0 rename to test/integration/branchDelete/expected/repo/file0 diff --git a/test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/branchRebase/expected/.git_keep/FETCH_HEAD b/test/integration/branchRebase/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/FETCH_HEAD rename to test/integration/branchRebase/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/branchRebase/expected/.git_keep/HEAD b/test/integration/branchRebase/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/HEAD rename to test/integration/branchRebase/expected/repo/.git_keep/HEAD diff --git a/test/integration/branchRebase/expected/.git_keep/ORIG_HEAD b/test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/ORIG_HEAD rename to test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/branchRebase/expected/.git_keep/config b/test/integration/branchRebase/expected/repo/.git_keep/config similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/config rename to test/integration/branchRebase/expected/repo/.git_keep/config diff --git a/test/integration/branchRebase/expected/.git_keep/description b/test/integration/branchRebase/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/description rename to test/integration/branchRebase/expected/repo/.git_keep/description diff --git a/test/integration/branchRebase/expected/.git_keep/index b/test/integration/branchRebase/expected/repo/.git_keep/index similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/index rename to test/integration/branchRebase/expected/repo/.git_keep/index diff --git a/test/integration/branchRebase/expected/.git_keep/info/exclude b/test/integration/branchRebase/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/info/exclude rename to test/integration/branchRebase/expected/repo/.git_keep/info/exclude diff --git a/test/integration/branchRebase/expected/.git_keep/logs/HEAD b/test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/logs/HEAD rename to test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop b/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop rename to test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop diff --git a/test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master b/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master rename to test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/branchRebase/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d rename to test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d diff --git a/test/integration/branchRebase/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca rename to test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca diff --git a/test/integration/branchRebase/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af rename to test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af diff --git a/test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 b/test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/branchRebase/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd rename to test/integration/branchRebase/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd diff --git a/test/integration/branchRebase/expected/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f b/test/integration/branchRebase/expected/repo/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f rename to test/integration/branchRebase/expected/repo/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f diff --git a/test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 b/test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 b/test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 b/test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/branchRebase/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/branchRebase/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/branchRebase/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/branchRebase/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 b/test/integration/branchRebase/expected/repo/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/69/f11ae88c8712fe38ffd0fe9ff9df05371500a6 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 b/test/integration/branchRebase/expected/repo/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/70/95508e3cd0fd40572f8e711170db38ef2342d7 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 b/test/integration/branchRebase/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/branchRebase/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 b/test/integration/branchRebase/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 b/test/integration/branchRebase/expected/repo/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 b/test/integration/branchRebase/expected/repo/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab18 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/branchRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 b/test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 b/test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f b/test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f rename to test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f diff --git a/test/integration/branchRebase/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c rename to test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c diff --git a/test/integration/branchRebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/branchRebase/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e rename to test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e diff --git a/test/integration/branchRebase/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 b/test/integration/branchRebase/expected/repo/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 b/test/integration/branchRebase/expected/repo/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 rename to test/integration/branchRebase/expected/repo/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 diff --git a/test/integration/branchRebase/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b b/test/integration/branchRebase/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b rename to test/integration/branchRebase/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b diff --git a/test/integration/branchRebase/expected/.git_keep/refs/heads/develop b/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/refs/heads/develop rename to test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop diff --git a/test/integration/branchRebase/expected/.git_keep/refs/heads/master b/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/branchRebase/expected/.git_keep/refs/heads/master rename to test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/branchRebase/expected/directory/file b/test/integration/branchRebase/expected/repo/directory/file similarity index 100% rename from test/integration/branchRebase/expected/directory/file rename to test/integration/branchRebase/expected/repo/directory/file diff --git a/test/integration/branchRebase/expected/directory/file2 b/test/integration/branchRebase/expected/repo/directory/file2 similarity index 100% rename from test/integration/branchRebase/expected/directory/file2 rename to test/integration/branchRebase/expected/repo/directory/file2 diff --git a/test/integration/branchRebase/expected/file1 b/test/integration/branchRebase/expected/repo/file1 similarity index 100% rename from test/integration/branchRebase/expected/file1 rename to test/integration/branchRebase/expected/repo/file1 diff --git a/test/integration/branchRebase/expected/file3 b/test/integration/branchRebase/expected/repo/file3 similarity index 100% rename from test/integration/branchRebase/expected/file3 rename to test/integration/branchRebase/expected/repo/file3 diff --git a/test/integration/branchRebase/expected/file4 b/test/integration/branchRebase/expected/repo/file4 similarity index 100% rename from test/integration/branchRebase/expected/file4 rename to test/integration/branchRebase/expected/repo/file4 diff --git a/test/integration/branchRebase/expected/file5 b/test/integration/branchRebase/expected/repo/file5 similarity index 100% rename from test/integration/branchRebase/expected/file5 rename to test/integration/branchRebase/expected/repo/file5 diff --git a/test/integration/branchReset/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/branchReset/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/branchReset/expected/.git_keep/FETCH_HEAD b/test/integration/branchReset/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchReset/expected/.git_keep/FETCH_HEAD rename to test/integration/branchReset/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/branchReset/expected/.git_keep/HEAD b/test/integration/branchReset/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/branchReset/expected/.git_keep/HEAD rename to test/integration/branchReset/expected/repo/.git_keep/HEAD diff --git a/test/integration/branchReset/expected/.git_keep/ORIG_HEAD b/test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/branchReset/expected/.git_keep/ORIG_HEAD rename to test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/branchReset/expected/.git_keep/config b/test/integration/branchReset/expected/repo/.git_keep/config similarity index 100% rename from test/integration/branchReset/expected/.git_keep/config rename to test/integration/branchReset/expected/repo/.git_keep/config diff --git a/test/integration/branchReset/expected/.git_keep/description b/test/integration/branchReset/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchReset/expected/.git_keep/description rename to test/integration/branchReset/expected/repo/.git_keep/description diff --git a/test/integration/branchReset/expected/.git_keep/index b/test/integration/branchReset/expected/repo/.git_keep/index similarity index 100% rename from test/integration/branchReset/expected/.git_keep/index rename to test/integration/branchReset/expected/repo/.git_keep/index diff --git a/test/integration/branchReset/expected/.git_keep/info/exclude b/test/integration/branchReset/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchReset/expected/.git_keep/info/exclude rename to test/integration/branchReset/expected/repo/.git_keep/info/exclude diff --git a/test/integration/branchReset/expected/.git_keep/logs/HEAD b/test/integration/branchReset/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/branchReset/expected/.git_keep/logs/HEAD rename to test/integration/branchReset/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/branchReset/expected/.git_keep/logs/refs/heads/develop b/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop similarity index 100% rename from test/integration/branchReset/expected/.git_keep/logs/refs/heads/develop rename to test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop diff --git a/test/integration/branchReset/expected/.git_keep/logs/refs/heads/master b/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/branchReset/expected/.git_keep/logs/refs/heads/master rename to test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/branchReset/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d rename to test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d diff --git a/test/integration/branchReset/expected/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd b/test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd rename to test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd diff --git a/test/integration/branchReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/branchReset/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca rename to test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca diff --git a/test/integration/branchReset/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af rename to test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af diff --git a/test/integration/branchReset/expected/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f b/test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f rename to test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f diff --git a/test/integration/branchReset/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd rename to test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd diff --git a/test/integration/branchReset/expected/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 b/test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 rename to test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 diff --git a/test/integration/branchReset/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 rename to test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 diff --git a/test/integration/branchReset/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/branchReset/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 rename to test/integration/branchReset/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 diff --git a/test/integration/branchReset/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 rename to test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 diff --git a/test/integration/branchReset/expected/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 b/test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 rename to test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 diff --git a/test/integration/branchReset/expected/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 b/test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 rename to test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 diff --git a/test/integration/branchReset/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 rename to test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 diff --git a/test/integration/branchReset/expected/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da b/test/integration/branchReset/expected/repo/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da rename to test/integration/branchReset/expected/repo/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da diff --git a/test/integration/branchReset/expected/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 b/test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 rename to test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 diff --git a/test/integration/branchReset/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 rename to test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 diff --git a/test/integration/branchReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/branchReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/branchReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/branchReset/expected/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 b/test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 rename to test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 diff --git a/test/integration/branchReset/expected/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 b/test/integration/branchReset/expected/repo/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 rename to test/integration/branchReset/expected/repo/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 diff --git a/test/integration/branchReset/expected/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c b/test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c rename to test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c diff --git a/test/integration/branchReset/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 b/test/integration/branchReset/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 rename to test/integration/branchReset/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 diff --git a/test/integration/branchReset/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/branchReset/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c rename to test/integration/branchReset/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c diff --git a/test/integration/branchReset/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/branchReset/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/branchReset/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/branchReset/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/branchReset/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e rename to test/integration/branchReset/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e diff --git a/test/integration/branchReset/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/branchReset/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 rename to test/integration/branchReset/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 diff --git a/test/integration/branchReset/expected/.git_keep/objects/ee/a0cf47f42fe8d027b4cecaf534ecc0673f7981 b/test/integration/branchReset/expected/repo/.git_keep/objects/ee/a0cf47f42fe8d027b4cecaf534ecc0673f7981 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/ee/a0cf47f42fe8d027b4cecaf534ecc0673f7981 rename to test/integration/branchReset/expected/repo/.git_keep/objects/ee/a0cf47f42fe8d027b4cecaf534ecc0673f7981 diff --git a/test/integration/branchReset/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/branchReset/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 rename to test/integration/branchReset/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 diff --git a/test/integration/branchReset/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b b/test/integration/branchReset/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b similarity index 100% rename from test/integration/branchReset/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b rename to test/integration/branchReset/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b diff --git a/test/integration/branchReset/expected/.git_keep/refs/heads/develop b/test/integration/branchReset/expected/repo/.git_keep/refs/heads/develop similarity index 100% rename from test/integration/branchReset/expected/.git_keep/refs/heads/develop rename to test/integration/branchReset/expected/repo/.git_keep/refs/heads/develop diff --git a/test/integration/branchReset/expected/.git_keep/refs/heads/master b/test/integration/branchReset/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/branchReset/expected/.git_keep/refs/heads/master rename to test/integration/branchReset/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/branchReset/expected/directory/file b/test/integration/branchReset/expected/repo/directory/file similarity index 100% rename from test/integration/branchReset/expected/directory/file rename to test/integration/branchReset/expected/repo/directory/file diff --git a/test/integration/branchReset/expected/directory/file2 b/test/integration/branchReset/expected/repo/directory/file2 similarity index 100% rename from test/integration/branchReset/expected/directory/file2 rename to test/integration/branchReset/expected/repo/directory/file2 diff --git a/test/integration/branchReset/expected/file1 b/test/integration/branchReset/expected/repo/file1 similarity index 100% rename from test/integration/branchReset/expected/file1 rename to test/integration/branchReset/expected/repo/file1 diff --git a/test/integration/branchReset/expected/file3 b/test/integration/branchReset/expected/repo/file3 similarity index 100% rename from test/integration/branchReset/expected/file3 rename to test/integration/branchReset/expected/repo/file3 diff --git a/test/integration/branchReset/expected/file4 b/test/integration/branchReset/expected/repo/file4 similarity index 100% rename from test/integration/branchReset/expected/file4 rename to test/integration/branchReset/expected/repo/file4 diff --git a/test/integration/branchReset/expected/file5 b/test/integration/branchReset/expected/repo/file5 similarity index 100% rename from test/integration/branchReset/expected/file5 rename to test/integration/branchReset/expected/repo/file5 diff --git a/test/integration/branchSuggestions/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchSuggestions/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/branchSuggestions/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/branchSuggestions/expected/.git_keep/FETCH_HEAD b/test/integration/branchSuggestions/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/FETCH_HEAD rename to test/integration/branchSuggestions/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/HEAD b/test/integration/branchSuggestions/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/HEAD rename to test/integration/branchSuggestions/expected/repo/.git_keep/HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/config b/test/integration/branchSuggestions/expected/repo/.git_keep/config similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/config rename to test/integration/branchSuggestions/expected/repo/.git_keep/config diff --git a/test/integration/branchSuggestions/expected/.git_keep/description b/test/integration/branchSuggestions/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/description rename to test/integration/branchSuggestions/expected/repo/.git_keep/description diff --git a/test/integration/branchSuggestions/expected/.git_keep/index b/test/integration/branchSuggestions/expected/repo/.git_keep/index similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/index rename to test/integration/branchSuggestions/expected/repo/.git_keep/index diff --git a/test/integration/branchSuggestions/expected/.git_keep/info/exclude b/test/integration/branchSuggestions/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/info/exclude rename to test/integration/branchSuggestions/expected/repo/.git_keep/info/exclude diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/HEAD b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/HEAD rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/master b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/master rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/new-branch similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/new-branch diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-2 b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-2 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-2 rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-2 diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-3 b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-3 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/new-branch-3 rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-3 diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/old-branch similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/old-branch diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-2 b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/old-branch-2 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-2 rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/old-branch-2 diff --git a/test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-3 b/test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/old-branch-3 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/logs/refs/heads/old-branch-3 rename to test/integration/branchSuggestions/expected/repo/.git_keep/logs/refs/heads/old-branch-3 diff --git a/test/integration/branchSuggestions/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/branchSuggestions/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/branchSuggestions/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/branchSuggestions/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/branchSuggestions/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/branchSuggestions/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/branchSuggestions/expected/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 b/test/integration/branchSuggestions/expected/repo/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 rename to test/integration/branchSuggestions/expected/repo/.git_keep/objects/75/e9e90a1d58c37d97d46a543dfbfd0f33fc52d8 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/master b/test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/refs/heads/master rename to test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch b/test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/new-branch similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch rename to test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/new-branch diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-2 b/test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/new-branch-2 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-2 rename to test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/new-branch-2 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-3 b/test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/new-branch-3 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/refs/heads/new-branch-3 rename to test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/new-branch-3 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch b/test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/old-branch similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch rename to test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/old-branch diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-2 b/test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/old-branch-2 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-2 rename to test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/old-branch-2 diff --git a/test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-3 b/test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/old-branch-3 similarity index 100% rename from test/integration/branchSuggestions/expected/.git_keep/refs/heads/old-branch-3 rename to test/integration/branchSuggestions/expected/repo/.git_keep/refs/heads/old-branch-3 diff --git a/test/integration/branchSuggestions/expected/file0 b/test/integration/branchSuggestions/expected/repo/file0 similarity index 100% rename from test/integration/branchSuggestions/expected/file0 rename to test/integration/branchSuggestions/expected/repo/file0 diff --git a/test/integration/cherryPicking/expected/.git_keep/COMMIT_EDITMSG b/test/integration/cherryPicking/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/cherryPicking/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/cherryPicking/expected/.git_keep/FETCH_HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/FETCH_HEAD rename to test/integration/cherryPicking/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/cherryPicking/expected/.git_keep/HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/HEAD rename to test/integration/cherryPicking/expected/repo/.git_keep/HEAD diff --git a/test/integration/cherryPicking/expected/.git_keep/ORIG_HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/ORIG_HEAD rename to test/integration/cherryPicking/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/cherryPicking/expected/.git_keep/REBASE_HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/REBASE_HEAD similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/REBASE_HEAD rename to test/integration/cherryPicking/expected/repo/.git_keep/REBASE_HEAD diff --git a/test/integration/cherryPicking/expected/.git_keep/config b/test/integration/cherryPicking/expected/repo/.git_keep/config similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/config rename to test/integration/cherryPicking/expected/repo/.git_keep/config diff --git a/test/integration/cherryPicking/expected/.git_keep/description b/test/integration/cherryPicking/expected/repo/.git_keep/description similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/description rename to test/integration/cherryPicking/expected/repo/.git_keep/description diff --git a/test/integration/cherryPicking/expected/.git_keep/index b/test/integration/cherryPicking/expected/repo/.git_keep/index similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/index rename to test/integration/cherryPicking/expected/repo/.git_keep/index diff --git a/test/integration/cherryPicking/expected/.git_keep/info/exclude b/test/integration/cherryPicking/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/info/exclude rename to test/integration/cherryPicking/expected/repo/.git_keep/info/exclude diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/logs/HEAD rename to test/integration/cherryPicking/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/base_branch similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/base_branch rename to test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/base_branch diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/develop b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/develop similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/develop rename to test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/develop diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/feature/cherry-picking rename to test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/master b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/master rename to test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/other_branch similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/logs/refs/heads/other_branch rename to test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/other_branch diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe b/test/integration/cherryPicking/expected/repo/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/cherryPicking/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/cherryPicking/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec b/test/integration/cherryPicking/expected/repo/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/5d/2484f3cb6ce658e296526c48e1a376b2790dfc b/test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/2484f3cb6ce658e296526c48e1a376b2790dfc similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/5d/2484f3cb6ce658e296526c48e1a376b2790dfc rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/2484f3cb6ce658e296526c48e1a376b2790dfc diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/65/c0438e428cd1aa94588eaa52eb7ebad7ec62fd b/test/integration/cherryPicking/expected/repo/.git_keep/objects/65/c0438e428cd1aa94588eaa52eb7ebad7ec62fd similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/65/c0438e428cd1aa94588eaa52eb7ebad7ec62fd rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/65/c0438e428cd1aa94588eaa52eb7ebad7ec62fd diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f b/test/integration/cherryPicking/expected/repo/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec b/test/integration/cherryPicking/expected/repo/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee b/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/cherryPicking/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e b/test/integration/cherryPicking/expected/repo/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/cherryPicking/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/f4/ffac820a371104fe611d81bc13a45b70a3ebb3 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/f4/ffac820a371104fe611d81bc13a45b70a3ebb3 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/f4/ffac820a371104fe611d81bc13a45b70a3ebb3 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/f4/ffac820a371104fe611d81bc13a45b70a3ebb3 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671 diff --git a/test/integration/cherryPicking/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 rename to test/integration/cherryPicking/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/base_branch b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/base_branch similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/refs/heads/base_branch rename to test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/base_branch diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/develop b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/develop similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/refs/heads/develop rename to test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/develop diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/refs/heads/feature/cherry-picking rename to test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/feature/cherry-picking diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/master b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/refs/heads/master rename to test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/cherryPicking/expected/.git_keep/refs/heads/other_branch b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/other_branch similarity index 100% rename from test/integration/cherryPicking/expected/.git_keep/refs/heads/other_branch rename to test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/other_branch diff --git a/test/integration/cherryPicking/expected/cherrypicking3 b/test/integration/cherryPicking/expected/repo/cherrypicking3 similarity index 100% rename from test/integration/cherryPicking/expected/cherrypicking3 rename to test/integration/cherryPicking/expected/repo/cherrypicking3 diff --git a/test/integration/cherryPicking/expected/cherrypicking4 b/test/integration/cherryPicking/expected/repo/cherrypicking4 similarity index 100% rename from test/integration/cherryPicking/expected/cherrypicking4 rename to test/integration/cherryPicking/expected/repo/cherrypicking4 diff --git a/test/integration/cherryPicking/expected/cherrypicking5 b/test/integration/cherryPicking/expected/repo/cherrypicking5 similarity index 100% rename from test/integration/cherryPicking/expected/cherrypicking5 rename to test/integration/cherryPicking/expected/repo/cherrypicking5 diff --git a/test/integration/cherryPicking/expected/directory/file b/test/integration/cherryPicking/expected/repo/directory/file similarity index 100% rename from test/integration/cherryPicking/expected/directory/file rename to test/integration/cherryPicking/expected/repo/directory/file diff --git a/test/integration/cherryPicking/expected/directory/file2 b/test/integration/cherryPicking/expected/repo/directory/file2 similarity index 100% rename from test/integration/cherryPicking/expected/directory/file2 rename to test/integration/cherryPicking/expected/repo/directory/file2 diff --git a/test/integration/cherryPicking/expected/file b/test/integration/cherryPicking/expected/repo/file similarity index 100% rename from test/integration/cherryPicking/expected/file rename to test/integration/cherryPicking/expected/repo/file diff --git a/test/integration/cherryPicking/expected/file1 b/test/integration/cherryPicking/expected/repo/file1 similarity index 100% rename from test/integration/cherryPicking/expected/file1 rename to test/integration/cherryPicking/expected/repo/file1 diff --git a/test/integration/cherryPicking/expected/file3 b/test/integration/cherryPicking/expected/repo/file3 similarity index 100% rename from test/integration/cherryPicking/expected/file3 rename to test/integration/cherryPicking/expected/repo/file3 diff --git a/test/integration/cherryPicking/expected/file4 b/test/integration/cherryPicking/expected/repo/file4 similarity index 100% rename from test/integration/cherryPicking/expected/file4 rename to test/integration/cherryPicking/expected/repo/file4 diff --git a/test/integration/cherryPicking/expected/file5 b/test/integration/cherryPicking/expected/repo/file5 similarity index 100% rename from test/integration/cherryPicking/expected/file5 rename to test/integration/cherryPicking/expected/repo/file5 diff --git a/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commit/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/commit/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/commit/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/commit/expected/.git_keep/FETCH_HEAD b/test/integration/commit/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/commit/expected/.git_keep/FETCH_HEAD rename to test/integration/commit/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/commit/expected/.git_keep/HEAD b/test/integration/commit/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/commit/expected/.git_keep/HEAD rename to test/integration/commit/expected/repo/.git_keep/HEAD diff --git a/test/integration/commit/expected/.git_keep/config b/test/integration/commit/expected/repo/.git_keep/config similarity index 100% rename from test/integration/commit/expected/.git_keep/config rename to test/integration/commit/expected/repo/.git_keep/config diff --git a/test/integration/commit/expected/.git_keep/description b/test/integration/commit/expected/repo/.git_keep/description similarity index 100% rename from test/integration/commit/expected/.git_keep/description rename to test/integration/commit/expected/repo/.git_keep/description diff --git a/test/integration/commit/expected/.git_keep/index b/test/integration/commit/expected/repo/.git_keep/index similarity index 100% rename from test/integration/commit/expected/.git_keep/index rename to test/integration/commit/expected/repo/.git_keep/index diff --git a/test/integration/commit/expected/.git_keep/info/exclude b/test/integration/commit/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/commit/expected/.git_keep/info/exclude rename to test/integration/commit/expected/repo/.git_keep/info/exclude diff --git a/test/integration/commit/expected/.git_keep/logs/HEAD b/test/integration/commit/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/commit/expected/.git_keep/logs/HEAD rename to test/integration/commit/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/commit/expected/.git_keep/logs/refs/heads/master b/test/integration/commit/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/commit/expected/.git_keep/logs/refs/heads/master rename to test/integration/commit/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/commit/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/commit/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 b/test/integration/commit/expected/repo/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 rename to test/integration/commit/expected/repo/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 diff --git a/test/integration/commit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/commit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/commit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/commit/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/commit/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/commit/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/commit/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/commit/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be rename to test/integration/commit/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be diff --git a/test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 b/test/integration/commit/expected/repo/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 rename to test/integration/commit/expected/repo/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 diff --git a/test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 b/test/integration/commit/expected/repo/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 rename to test/integration/commit/expected/repo/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 diff --git a/test/integration/commit/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/commit/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/commit/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/commit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/commit/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/commit/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 b/test/integration/commit/expected/repo/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 rename to test/integration/commit/expected/repo/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 diff --git a/test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/commit/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/commit/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/commit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/commit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 b/test/integration/commit/expected/repo/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 similarity index 100% rename from test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 rename to test/integration/commit/expected/repo/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 diff --git a/test/integration/commit/expected/.git_keep/refs/heads/master b/test/integration/commit/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/commit/expected/.git_keep/refs/heads/master rename to test/integration/commit/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/commit/expected/myfile1 b/test/integration/commit/expected/repo/myfile1 similarity index 100% rename from test/integration/commit/expected/myfile1 rename to test/integration/commit/expected/repo/myfile1 diff --git a/test/integration/commit/expected/myfile2 b/test/integration/commit/expected/repo/myfile2 similarity index 100% rename from test/integration/commit/expected/myfile2 rename to test/integration/commit/expected/repo/myfile2 diff --git a/test/integration/commit/expected/myfile3 b/test/integration/commit/expected/repo/myfile3 similarity index 100% rename from test/integration/commit/expected/myfile3 rename to test/integration/commit/expected/repo/myfile3 diff --git a/test/integration/commit/expected/myfile4 b/test/integration/commit/expected/repo/myfile4 similarity index 100% rename from test/integration/commit/expected/myfile4 rename to test/integration/commit/expected/repo/myfile4 diff --git a/test/integration/commit/expected/myfile5 b/test/integration/commit/expected/repo/myfile5 similarity index 100% rename from test/integration/commit/expected/myfile5 rename to test/integration/commit/expected/repo/myfile5 diff --git a/test/integration/commitMultiline/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commitMultiline/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/commitMultiline/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/commitMultiline/expected/.git_keep/FETCH_HEAD b/test/integration/commitMultiline/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/FETCH_HEAD rename to test/integration/commitMultiline/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/commitMultiline/expected/.git_keep/HEAD b/test/integration/commitMultiline/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/HEAD rename to test/integration/commitMultiline/expected/repo/.git_keep/HEAD diff --git a/test/integration/commitMultiline/expected/.git_keep/config b/test/integration/commitMultiline/expected/repo/.git_keep/config similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/config rename to test/integration/commitMultiline/expected/repo/.git_keep/config diff --git a/test/integration/commitMultiline/expected/.git_keep/description b/test/integration/commitMultiline/expected/repo/.git_keep/description similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/description rename to test/integration/commitMultiline/expected/repo/.git_keep/description diff --git a/test/integration/commitMultiline/expected/.git_keep/index b/test/integration/commitMultiline/expected/repo/.git_keep/index similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/index rename to test/integration/commitMultiline/expected/repo/.git_keep/index diff --git a/test/integration/commitMultiline/expected/.git_keep/info/exclude b/test/integration/commitMultiline/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/info/exclude rename to test/integration/commitMultiline/expected/repo/.git_keep/info/exclude diff --git a/test/integration/commitMultiline/expected/.git_keep/logs/HEAD b/test/integration/commitMultiline/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/logs/HEAD rename to test/integration/commitMultiline/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/commitMultiline/expected/.git_keep/logs/refs/heads/master b/test/integration/commitMultiline/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/logs/refs/heads/master rename to test/integration/commitMultiline/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/17/6069f0ded1db43eecb3b629a6077dba6c68295 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/17/6069f0ded1db43eecb3b629a6077dba6c68295 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/17/6069f0ded1db43eecb3b629a6077dba6c68295 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/17/6069f0ded1db43eecb3b629a6077dba6c68295 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/commitMultiline/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/commitMultiline/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/37/128a3020849daa0847462d14c384cc74c42ae0 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/37/128a3020849daa0847462d14c384cc74c42ae0 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/37/128a3020849daa0847462d14c384cc74c42ae0 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/37/128a3020849daa0847462d14c384cc74c42ae0 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/39/33a268c502712421b7bfa04888319d6f108574 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/39/33a268c502712421b7bfa04888319d6f108574 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/39/33a268c502712421b7bfa04888319d6f108574 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/39/33a268c502712421b7bfa04888319d6f108574 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/commitMultiline/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b b/test/integration/commitMultiline/expected/repo/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/9f/1b5440546da24daad7014ccf3e1f4d81f9414b b/test/integration/commitMultiline/expected/repo/.git_keep/objects/9f/1b5440546da24daad7014ccf3e1f4d81f9414b similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/9f/1b5440546da24daad7014ccf3e1f4d81f9414b rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/9f/1b5440546da24daad7014ccf3e1f4d81f9414b diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/commitMultiline/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/commitMultiline/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/commitMultiline/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/commitMultiline/expected/.git_keep/refs/heads/master b/test/integration/commitMultiline/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/commitMultiline/expected/.git_keep/refs/heads/master rename to test/integration/commitMultiline/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/commitMultiline/expected/myfile1 b/test/integration/commitMultiline/expected/repo/myfile1 similarity index 100% rename from test/integration/commitMultiline/expected/myfile1 rename to test/integration/commitMultiline/expected/repo/myfile1 diff --git a/test/integration/commitMultiline/expected/myfile2 b/test/integration/commitMultiline/expected/repo/myfile2 similarity index 100% rename from test/integration/commitMultiline/expected/myfile2 rename to test/integration/commitMultiline/expected/repo/myfile2 diff --git a/test/integration/commitMultiline/expected/myfile3 b/test/integration/commitMultiline/expected/repo/myfile3 similarity index 100% rename from test/integration/commitMultiline/expected/myfile3 rename to test/integration/commitMultiline/expected/repo/myfile3 diff --git a/test/integration/commitMultiline/expected/myfile4 b/test/integration/commitMultiline/expected/repo/myfile4 similarity index 100% rename from test/integration/commitMultiline/expected/myfile4 rename to test/integration/commitMultiline/expected/repo/myfile4 diff --git a/test/integration/commitMultiline/expected/myfile5 b/test/integration/commitMultiline/expected/repo/myfile5 similarity index 100% rename from test/integration/commitMultiline/expected/myfile5 rename to test/integration/commitMultiline/expected/repo/myfile5 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commitsNewBranch/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/commitsNewBranch/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/commitsNewBranch/expected/.git_keep/FETCH_HEAD b/test/integration/commitsNewBranch/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/FETCH_HEAD rename to test/integration/commitsNewBranch/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/commitsNewBranch/expected/.git_keep/HEAD b/test/integration/commitsNewBranch/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/HEAD rename to test/integration/commitsNewBranch/expected/repo/.git_keep/HEAD diff --git a/test/integration/commitsNewBranch/expected/.git_keep/config b/test/integration/commitsNewBranch/expected/repo/.git_keep/config similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/config rename to test/integration/commitsNewBranch/expected/repo/.git_keep/config diff --git a/test/integration/commitsNewBranch/expected/.git_keep/description b/test/integration/commitsNewBranch/expected/repo/.git_keep/description similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/description rename to test/integration/commitsNewBranch/expected/repo/.git_keep/description diff --git a/test/integration/commitsNewBranch/expected/.git_keep/index b/test/integration/commitsNewBranch/expected/repo/.git_keep/index similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/index rename to test/integration/commitsNewBranch/expected/repo/.git_keep/index diff --git a/test/integration/commitsNewBranch/expected/.git_keep/info/exclude b/test/integration/commitsNewBranch/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/info/exclude rename to test/integration/commitsNewBranch/expected/repo/.git_keep/info/exclude diff --git a/test/integration/commitsNewBranch/expected/.git_keep/logs/HEAD b/test/integration/commitsNewBranch/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/logs/HEAD rename to test/integration/commitsNewBranch/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/lol b/test/integration/commitsNewBranch/expected/repo/.git_keep/logs/refs/heads/lol similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/lol rename to test/integration/commitsNewBranch/expected/repo/.git_keep/logs/refs/heads/lol diff --git a/test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/master b/test/integration/commitsNewBranch/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/logs/refs/heads/master rename to test/integration/commitsNewBranch/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/00/29f9bf66e346d47ede6a501abb5b82bee60096 b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/00/29f9bf66e346d47ede6a501abb5b82bee60096 similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/00/29f9bf66e346d47ede6a501abb5b82bee60096 rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/00/29f9bf66e346d47ede6a501abb5b82bee60096 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/99/01fd9b7766be600bed07f55f1794a759527a98 b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/99/01fd9b7766be600bed07f55f1794a759527a98 similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/99/01fd9b7766be600bed07f55f1794a759527a98 rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/99/01fd9b7766be600bed07f55f1794a759527a98 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/objects/e1/cb250774fb8606d33062518d0ae03831130249 b/test/integration/commitsNewBranch/expected/repo/.git_keep/objects/e1/cb250774fb8606d33062518d0ae03831130249 similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/objects/e1/cb250774fb8606d33062518d0ae03831130249 rename to test/integration/commitsNewBranch/expected/repo/.git_keep/objects/e1/cb250774fb8606d33062518d0ae03831130249 diff --git a/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/lol b/test/integration/commitsNewBranch/expected/repo/.git_keep/refs/heads/lol similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/refs/heads/lol rename to test/integration/commitsNewBranch/expected/repo/.git_keep/refs/heads/lol diff --git a/test/integration/commitsNewBranch/expected/.git_keep/refs/heads/master b/test/integration/commitsNewBranch/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/commitsNewBranch/expected/.git_keep/refs/heads/master rename to test/integration/commitsNewBranch/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/commitsNewBranch/expected/file0 b/test/integration/commitsNewBranch/expected/repo/file0 similarity index 100% rename from test/integration/commitsNewBranch/expected/file0 rename to test/integration/commitsNewBranch/expected/repo/file0 diff --git a/test/integration/commitsNewBranch/expected/file1 b/test/integration/commitsNewBranch/expected/repo/file1 similarity index 100% rename from test/integration/commitsNewBranch/expected/file1 rename to test/integration/commitsNewBranch/expected/repo/file1 diff --git a/test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commitsRevert/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/commitsRevert/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/commitsRevert/expected/.git_keep/FETCH_HEAD b/test/integration/commitsRevert/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/FETCH_HEAD rename to test/integration/commitsRevert/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/commitsRevert/expected/.git_keep/HEAD b/test/integration/commitsRevert/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/HEAD rename to test/integration/commitsRevert/expected/repo/.git_keep/HEAD diff --git a/test/integration/commitsRevert/expected/.git_keep/config b/test/integration/commitsRevert/expected/repo/.git_keep/config similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/config rename to test/integration/commitsRevert/expected/repo/.git_keep/config diff --git a/test/integration/commitsRevert/expected/.git_keep/description b/test/integration/commitsRevert/expected/repo/.git_keep/description similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/description rename to test/integration/commitsRevert/expected/repo/.git_keep/description diff --git a/test/integration/commitsRevert/expected/.git_keep/index b/test/integration/commitsRevert/expected/repo/.git_keep/index similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/index rename to test/integration/commitsRevert/expected/repo/.git_keep/index diff --git a/test/integration/commitsRevert/expected/.git_keep/info/exclude b/test/integration/commitsRevert/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/info/exclude rename to test/integration/commitsRevert/expected/repo/.git_keep/info/exclude diff --git a/test/integration/commitsRevert/expected/.git_keep/logs/HEAD b/test/integration/commitsRevert/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/logs/HEAD rename to test/integration/commitsRevert/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master b/test/integration/commitsRevert/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/logs/refs/heads/master rename to test/integration/commitsRevert/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/commitsRevert/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f b/test/integration/commitsRevert/expected/repo/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c b/test/integration/commitsRevert/expected/repo/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 diff --git a/test/integration/commitsRevert/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/commitsRevert/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/commitsRevert/expected/.git_keep/refs/heads/master b/test/integration/commitsRevert/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/commitsRevert/expected/.git_keep/refs/heads/master rename to test/integration/commitsRevert/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/commitsRevert/expected/file0 b/test/integration/commitsRevert/expected/repo/file0 similarity index 100% rename from test/integration/commitsRevert/expected/file0 rename to test/integration/commitsRevert/expected/repo/file0 diff --git a/test/integration/commitsRevert/expected/file2 b/test/integration/commitsRevert/expected/repo/file2 similarity index 100% rename from test/integration/commitsRevert/expected/file2 rename to test/integration/commitsRevert/expected/repo/file2 diff --git a/test/integration/confirmQuit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/confirmQuit/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/confirmQuit/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/confirmQuit/expected/.git_keep/FETCH_HEAD b/test/integration/confirmQuit/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/FETCH_HEAD rename to test/integration/confirmQuit/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/confirmQuit/expected/.git_keep/HEAD b/test/integration/confirmQuit/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/HEAD rename to test/integration/confirmQuit/expected/repo/.git_keep/HEAD diff --git a/test/integration/confirmQuit/expected/.git_keep/config b/test/integration/confirmQuit/expected/repo/.git_keep/config similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/config rename to test/integration/confirmQuit/expected/repo/.git_keep/config diff --git a/test/integration/confirmQuit/expected/.git_keep/description b/test/integration/confirmQuit/expected/repo/.git_keep/description similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/description rename to test/integration/confirmQuit/expected/repo/.git_keep/description diff --git a/test/integration/confirmQuit/expected/.git_keep/index b/test/integration/confirmQuit/expected/repo/.git_keep/index similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/index rename to test/integration/confirmQuit/expected/repo/.git_keep/index diff --git a/test/integration/confirmQuit/expected/.git_keep/info/exclude b/test/integration/confirmQuit/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/info/exclude rename to test/integration/confirmQuit/expected/repo/.git_keep/info/exclude diff --git a/test/integration/confirmQuit/expected/.git_keep/logs/HEAD b/test/integration/confirmQuit/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/logs/HEAD rename to test/integration/confirmQuit/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/confirmQuit/expected/.git_keep/logs/refs/heads/master b/test/integration/confirmQuit/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/logs/refs/heads/master rename to test/integration/confirmQuit/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/confirmQuit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/confirmQuit/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/confirmQuit/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/confirmQuit/expected/.git_keep/objects/54/4efed4e669ec3bd64b44799175bffac95035f5 b/test/integration/confirmQuit/expected/repo/.git_keep/objects/54/4efed4e669ec3bd64b44799175bffac95035f5 similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/objects/54/4efed4e669ec3bd64b44799175bffac95035f5 rename to test/integration/confirmQuit/expected/repo/.git_keep/objects/54/4efed4e669ec3bd64b44799175bffac95035f5 diff --git a/test/integration/confirmQuit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/confirmQuit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/confirmQuit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/confirmQuit/expected/.git_keep/refs/heads/master b/test/integration/confirmQuit/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/confirmQuit/expected/.git_keep/refs/heads/master rename to test/integration/confirmQuit/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/confirmQuit/expected/myfile1 b/test/integration/confirmQuit/expected/repo/myfile1 similarity index 100% rename from test/integration/confirmQuit/expected/myfile1 rename to test/integration/confirmQuit/expected/repo/myfile1 diff --git a/test/integration/customCommands/expected/.git_keep/COMMIT_EDITMSG b/test/integration/customCommands/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/customCommands/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/customCommands/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/customCommands/expected/.git_keep/FETCH_HEAD b/test/integration/customCommands/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/customCommands/expected/.git_keep/FETCH_HEAD rename to test/integration/customCommands/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/customCommands/expected/.git_keep/HEAD b/test/integration/customCommands/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/customCommands/expected/.git_keep/HEAD rename to test/integration/customCommands/expected/repo/.git_keep/HEAD diff --git a/test/integration/customCommands/expected/.git_keep/config b/test/integration/customCommands/expected/repo/.git_keep/config similarity index 100% rename from test/integration/customCommands/expected/.git_keep/config rename to test/integration/customCommands/expected/repo/.git_keep/config diff --git a/test/integration/customCommands/expected/.git_keep/description b/test/integration/customCommands/expected/repo/.git_keep/description similarity index 100% rename from test/integration/customCommands/expected/.git_keep/description rename to test/integration/customCommands/expected/repo/.git_keep/description diff --git a/test/integration/customCommands/expected/.git_keep/index b/test/integration/customCommands/expected/repo/.git_keep/index similarity index 100% rename from test/integration/customCommands/expected/.git_keep/index rename to test/integration/customCommands/expected/repo/.git_keep/index diff --git a/test/integration/customCommands/expected/.git_keep/info/exclude b/test/integration/customCommands/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/customCommands/expected/.git_keep/info/exclude rename to test/integration/customCommands/expected/repo/.git_keep/info/exclude diff --git a/test/integration/customCommands/expected/.git_keep/logs/HEAD b/test/integration/customCommands/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/customCommands/expected/.git_keep/logs/HEAD rename to test/integration/customCommands/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/customCommands/expected/.git_keep/logs/refs/heads/master b/test/integration/customCommands/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/customCommands/expected/.git_keep/logs/refs/heads/master rename to test/integration/customCommands/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/customCommands/expected/.git_keep/objects/15/bdb2c31c825116ad5af06ee25517d90b24f13b b/test/integration/customCommands/expected/repo/.git_keep/objects/15/bdb2c31c825116ad5af06ee25517d90b24f13b similarity index 100% rename from test/integration/customCommands/expected/.git_keep/objects/15/bdb2c31c825116ad5af06ee25517d90b24f13b rename to test/integration/customCommands/expected/repo/.git_keep/objects/15/bdb2c31c825116ad5af06ee25517d90b24f13b diff --git a/test/integration/customCommands/expected/.git_keep/objects/20/f11a5545b04a86ca81f7a9967d5207349052d7 b/test/integration/customCommands/expected/repo/.git_keep/objects/20/f11a5545b04a86ca81f7a9967d5207349052d7 similarity index 100% rename from test/integration/customCommands/expected/.git_keep/objects/20/f11a5545b04a86ca81f7a9967d5207349052d7 rename to test/integration/customCommands/expected/repo/.git_keep/objects/20/f11a5545b04a86ca81f7a9967d5207349052d7 diff --git a/test/integration/customCommands/expected/.git_keep/objects/8a/2e45643093ea7cf7b06382e38470034c24e812 b/test/integration/customCommands/expected/repo/.git_keep/objects/8a/2e45643093ea7cf7b06382e38470034c24e812 similarity index 100% rename from test/integration/customCommands/expected/.git_keep/objects/8a/2e45643093ea7cf7b06382e38470034c24e812 rename to test/integration/customCommands/expected/repo/.git_keep/objects/8a/2e45643093ea7cf7b06382e38470034c24e812 diff --git a/test/integration/customCommands/expected/.git_keep/refs/heads/master b/test/integration/customCommands/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/customCommands/expected/.git_keep/refs/heads/master rename to test/integration/customCommands/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/customCommands/expected/blah b/test/integration/customCommands/expected/repo/blah similarity index 100% rename from test/integration/customCommands/expected/blah rename to test/integration/customCommands/expected/repo/blah diff --git a/test/integration/customCommandsComplex/expected/.git_keep/COMMIT_EDITMSG b/test/integration/customCommandsComplex/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/customCommandsComplex/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/customCommandsComplex/expected/.git_keep/FETCH_HEAD b/test/integration/customCommandsComplex/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/FETCH_HEAD rename to test/integration/customCommandsComplex/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/customCommandsComplex/expected/.git_keep/HEAD b/test/integration/customCommandsComplex/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/HEAD rename to test/integration/customCommandsComplex/expected/repo/.git_keep/HEAD diff --git a/test/integration/customCommandsComplex/expected/.git_keep/config b/test/integration/customCommandsComplex/expected/repo/.git_keep/config similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/config rename to test/integration/customCommandsComplex/expected/repo/.git_keep/config diff --git a/test/integration/customCommandsComplex/expected/.git_keep/description b/test/integration/customCommandsComplex/expected/repo/.git_keep/description similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/description rename to test/integration/customCommandsComplex/expected/repo/.git_keep/description diff --git a/test/integration/customCommandsComplex/expected/.git_keep/index b/test/integration/customCommandsComplex/expected/repo/.git_keep/index similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/index rename to test/integration/customCommandsComplex/expected/repo/.git_keep/index diff --git a/test/integration/customCommandsComplex/expected/.git_keep/info/exclude b/test/integration/customCommandsComplex/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/info/exclude rename to test/integration/customCommandsComplex/expected/repo/.git_keep/info/exclude diff --git a/test/integration/customCommandsComplex/expected/.git_keep/logs/HEAD b/test/integration/customCommandsComplex/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/logs/HEAD rename to test/integration/customCommandsComplex/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/customCommandsComplex/expected/.git_keep/logs/refs/heads/master b/test/integration/customCommandsComplex/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/logs/refs/heads/master rename to test/integration/customCommandsComplex/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/05/3cf208ac3728c36c6ed86f2a03a1fb72a8e6bc b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/05/3cf208ac3728c36c6ed86f2a03a1fb72a8e6bc similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/05/3cf208ac3728c36c6ed86f2a03a1fb72a8e6bc rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/05/3cf208ac3728c36c6ed86f2a03a1fb72a8e6bc diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/4f/dfedfd9d406506be8b02f5b863dbc08d43cc9f b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/4f/dfedfd9d406506be8b02f5b863dbc08d43cc9f similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/4f/dfedfd9d406506be8b02f5b863dbc08d43cc9f rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/4f/dfedfd9d406506be8b02f5b863dbc08d43cc9f diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/54/28838691c97ac192c8b8e1c3f573d8541a94b6 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/54/28838691c97ac192c8b8e1c3f573d8541a94b6 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/54/28838691c97ac192c8b8e1c3f573d8541a94b6 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/54/28838691c97ac192c8b8e1c3f573d8541a94b6 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/7d/b446a082f8c10183f1f27178698f07f3750b6b b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/7d/b446a082f8c10183f1f27178698f07f3750b6b similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/7d/b446a082f8c10183f1f27178698f07f3750b6b rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/7d/b446a082f8c10183f1f27178698f07f3750b6b diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/7d/d93a4be3d27d40fbe791d6d77e0d2fedc4d785 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/7d/d93a4be3d27d40fbe791d6d77e0d2fedc4d785 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/7d/d93a4be3d27d40fbe791d6d77e0d2fedc4d785 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/7d/d93a4be3d27d40fbe791d6d77e0d2fedc4d785 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/ab/38b1ca116f77648925d952e731f419db360cdb b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/ab/38b1ca116f77648925d952e731f419db360cdb similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/ab/38b1ca116f77648925d952e731f419db360cdb rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/ab/38b1ca116f77648925d952e731f419db360cdb diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/customCommandsComplex/expected/.git_keep/objects/f7/08d3e3819470a69f6c8562ff1e68eef02f8cac b/test/integration/customCommandsComplex/expected/repo/.git_keep/objects/f7/08d3e3819470a69f6c8562ff1e68eef02f8cac similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/objects/f7/08d3e3819470a69f6c8562ff1e68eef02f8cac rename to test/integration/customCommandsComplex/expected/repo/.git_keep/objects/f7/08d3e3819470a69f6c8562ff1e68eef02f8cac diff --git a/test/integration/customCommandsComplex/expected/.git_keep/refs/heads/master b/test/integration/customCommandsComplex/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/customCommandsComplex/expected/.git_keep/refs/heads/master rename to test/integration/customCommandsComplex/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/customCommandsComplex/expected/myfile1 b/test/integration/customCommandsComplex/expected/repo/myfile1 similarity index 100% rename from test/integration/customCommandsComplex/expected/myfile1 rename to test/integration/customCommandsComplex/expected/repo/myfile1 diff --git a/test/integration/customCommandsComplex/expected/myfile2 b/test/integration/customCommandsComplex/expected/repo/myfile2 similarity index 100% rename from test/integration/customCommandsComplex/expected/myfile2 rename to test/integration/customCommandsComplex/expected/repo/myfile2 diff --git a/test/integration/customCommandsComplex/expected/myfile3 b/test/integration/customCommandsComplex/expected/repo/myfile3 similarity index 100% rename from test/integration/customCommandsComplex/expected/myfile3 rename to test/integration/customCommandsComplex/expected/repo/myfile3 diff --git a/test/integration/customCommandsComplex/expected/myfile4 b/test/integration/customCommandsComplex/expected/repo/myfile4 similarity index 100% rename from test/integration/customCommandsComplex/expected/myfile4 rename to test/integration/customCommandsComplex/expected/repo/myfile4 diff --git a/test/integration/customCommandsComplex/expected/output.txt b/test/integration/customCommandsComplex/expected/repo/output.txt similarity index 100% rename from test/integration/customCommandsComplex/expected/output.txt rename to test/integration/customCommandsComplex/expected/repo/output.txt diff --git a/test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/diffing/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/diffing/expected/.git_keep/FETCH_HEAD b/test/integration/diffing/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/diffing/expected/.git_keep/FETCH_HEAD rename to test/integration/diffing/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/diffing/expected/.git_keep/HEAD b/test/integration/diffing/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/diffing/expected/.git_keep/HEAD rename to test/integration/diffing/expected/repo/.git_keep/HEAD diff --git a/test/integration/diffing/expected/.git_keep/config b/test/integration/diffing/expected/repo/.git_keep/config similarity index 100% rename from test/integration/diffing/expected/.git_keep/config rename to test/integration/diffing/expected/repo/.git_keep/config diff --git a/test/integration/diffing/expected/.git_keep/description b/test/integration/diffing/expected/repo/.git_keep/description similarity index 100% rename from test/integration/diffing/expected/.git_keep/description rename to test/integration/diffing/expected/repo/.git_keep/description diff --git a/test/integration/diffing/expected/.git_keep/index b/test/integration/diffing/expected/repo/.git_keep/index similarity index 100% rename from test/integration/diffing/expected/.git_keep/index rename to test/integration/diffing/expected/repo/.git_keep/index diff --git a/test/integration/diffing/expected/.git_keep/info/exclude b/test/integration/diffing/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/diffing/expected/.git_keep/info/exclude rename to test/integration/diffing/expected/repo/.git_keep/info/exclude diff --git a/test/integration/diffing/expected/.git_keep/logs/HEAD b/test/integration/diffing/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/diffing/expected/.git_keep/logs/HEAD rename to test/integration/diffing/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/diffing/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/diffing/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/diffing/expected/.git_keep/logs/refs/heads/master rename to test/integration/diffing/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 b/test/integration/diffing/expected/repo/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 rename to test/integration/diffing/expected/repo/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 diff --git a/test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/diffing/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 b/test/integration/diffing/expected/repo/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 rename to test/integration/diffing/expected/repo/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 diff --git a/test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/diffing/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/diffing/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/diffing/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/diffing/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/diffing/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/diffing/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/diffing/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/diffing/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 b/test/integration/diffing/expected/repo/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 rename to test/integration/diffing/expected/repo/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 diff --git a/test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/diffing/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd b/test/integration/diffing/expected/repo/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd rename to test/integration/diffing/expected/repo/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd diff --git a/test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/diffing/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c b/test/integration/diffing/expected/repo/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c rename to test/integration/diffing/expected/repo/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c diff --git a/test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/diffing/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 b/test/integration/diffing/expected/repo/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 rename to test/integration/diffing/expected/repo/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 diff --git a/test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/diffing/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/diffing/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf b/test/integration/diffing/expected/repo/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf rename to test/integration/diffing/expected/repo/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf diff --git a/test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/diffing/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/diffing/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc b/test/integration/diffing/expected/repo/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc similarity index 100% rename from test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc rename to test/integration/diffing/expected/repo/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc diff --git a/test/integration/diffing/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/diffing/expected/.git_keep/refs/heads/branch2 rename to test/integration/diffing/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/diffing/expected/.git_keep/refs/heads/master b/test/integration/diffing/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/diffing/expected/.git_keep/refs/heads/master rename to test/integration/diffing/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/diffing/expected/file0 b/test/integration/diffing/expected/repo/file0 similarity index 100% rename from test/integration/diffing/expected/file0 rename to test/integration/diffing/expected/repo/file0 diff --git a/test/integration/diffing/expected/file1 b/test/integration/diffing/expected/repo/file1 similarity index 100% rename from test/integration/diffing/expected/file1 rename to test/integration/diffing/expected/repo/file1 diff --git a/test/integration/diffing/expected/file2 b/test/integration/diffing/expected/repo/file2 similarity index 100% rename from test/integration/diffing/expected/file2 rename to test/integration/diffing/expected/repo/file2 diff --git a/test/integration/diffing/expected/file4 b/test/integration/diffing/expected/repo/file4 similarity index 100% rename from test/integration/diffing/expected/file4 rename to test/integration/diffing/expected/repo/file4 diff --git a/test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing2/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/diffing2/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/diffing2/expected/.git_keep/FETCH_HEAD b/test/integration/diffing2/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/diffing2/expected/.git_keep/FETCH_HEAD rename to test/integration/diffing2/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/diffing2/expected/.git_keep/HEAD b/test/integration/diffing2/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/diffing2/expected/.git_keep/HEAD rename to test/integration/diffing2/expected/repo/.git_keep/HEAD diff --git a/test/integration/diffing2/expected/.git_keep/config b/test/integration/diffing2/expected/repo/.git_keep/config similarity index 100% rename from test/integration/diffing2/expected/.git_keep/config rename to test/integration/diffing2/expected/repo/.git_keep/config diff --git a/test/integration/diffing2/expected/.git_keep/description b/test/integration/diffing2/expected/repo/.git_keep/description similarity index 100% rename from test/integration/diffing2/expected/.git_keep/description rename to test/integration/diffing2/expected/repo/.git_keep/description diff --git a/test/integration/diffing2/expected/.git_keep/index b/test/integration/diffing2/expected/repo/.git_keep/index similarity index 100% rename from test/integration/diffing2/expected/.git_keep/index rename to test/integration/diffing2/expected/repo/.git_keep/index diff --git a/test/integration/diffing2/expected/.git_keep/info/exclude b/test/integration/diffing2/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/diffing2/expected/.git_keep/info/exclude rename to test/integration/diffing2/expected/repo/.git_keep/info/exclude diff --git a/test/integration/diffing2/expected/.git_keep/logs/HEAD b/test/integration/diffing2/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/diffing2/expected/.git_keep/logs/HEAD rename to test/integration/diffing2/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing2/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/diffing2/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/diffing2/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing2/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/diffing2/expected/.git_keep/logs/refs/heads/master rename to test/integration/diffing2/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf b/test/integration/diffing2/expected/repo/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf rename to test/integration/diffing2/expected/repo/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf diff --git a/test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b b/test/integration/diffing2/expected/repo/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b rename to test/integration/diffing2/expected/repo/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b diff --git a/test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/diffing2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/diffing2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 b/test/integration/diffing2/expected/repo/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 rename to test/integration/diffing2/expected/repo/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 diff --git a/test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/diffing2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/diffing2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/diffing2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/diffing2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/diffing2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/diffing2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/diffing2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/diffing2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 b/test/integration/diffing2/expected/repo/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 rename to test/integration/diffing2/expected/repo/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 diff --git a/test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a b/test/integration/diffing2/expected/repo/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a rename to test/integration/diffing2/expected/repo/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a diff --git a/test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/diffing2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/diffing2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 b/test/integration/diffing2/expected/repo/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 rename to test/integration/diffing2/expected/repo/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 diff --git a/test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/diffing2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 b/test/integration/diffing2/expected/repo/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 rename to test/integration/diffing2/expected/repo/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 diff --git a/test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/diffing2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/diffing2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/diffing2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e b/test/integration/diffing2/expected/repo/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e similarity index 100% rename from test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e rename to test/integration/diffing2/expected/repo/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e diff --git a/test/integration/diffing2/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing2/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/diffing2/expected/.git_keep/refs/heads/branch2 rename to test/integration/diffing2/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/diffing2/expected/.git_keep/refs/heads/master b/test/integration/diffing2/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/diffing2/expected/.git_keep/refs/heads/master rename to test/integration/diffing2/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/diffing2/expected/file0 b/test/integration/diffing2/expected/repo/file0 similarity index 100% rename from test/integration/diffing2/expected/file0 rename to test/integration/diffing2/expected/repo/file0 diff --git a/test/integration/diffing2/expected/file1 b/test/integration/diffing2/expected/repo/file1 similarity index 100% rename from test/integration/diffing2/expected/file1 rename to test/integration/diffing2/expected/repo/file1 diff --git a/test/integration/diffing2/expected/file2 b/test/integration/diffing2/expected/repo/file2 similarity index 100% rename from test/integration/diffing2/expected/file2 rename to test/integration/diffing2/expected/repo/file2 diff --git a/test/integration/diffing2/expected/file4 b/test/integration/diffing2/expected/repo/file4 similarity index 100% rename from test/integration/diffing2/expected/file4 rename to test/integration/diffing2/expected/repo/file4 diff --git a/test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing3/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/diffing3/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/diffing3/expected/.git_keep/FETCH_HEAD b/test/integration/diffing3/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/diffing3/expected/.git_keep/FETCH_HEAD rename to test/integration/diffing3/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/diffing3/expected/.git_keep/HEAD b/test/integration/diffing3/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/diffing3/expected/.git_keep/HEAD rename to test/integration/diffing3/expected/repo/.git_keep/HEAD diff --git a/test/integration/diffing3/expected/.git_keep/config b/test/integration/diffing3/expected/repo/.git_keep/config similarity index 100% rename from test/integration/diffing3/expected/.git_keep/config rename to test/integration/diffing3/expected/repo/.git_keep/config diff --git a/test/integration/diffing3/expected/.git_keep/description b/test/integration/diffing3/expected/repo/.git_keep/description similarity index 100% rename from test/integration/diffing3/expected/.git_keep/description rename to test/integration/diffing3/expected/repo/.git_keep/description diff --git a/test/integration/diffing3/expected/.git_keep/index b/test/integration/diffing3/expected/repo/.git_keep/index similarity index 100% rename from test/integration/diffing3/expected/.git_keep/index rename to test/integration/diffing3/expected/repo/.git_keep/index diff --git a/test/integration/diffing3/expected/.git_keep/info/exclude b/test/integration/diffing3/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/diffing3/expected/.git_keep/info/exclude rename to test/integration/diffing3/expected/repo/.git_keep/info/exclude diff --git a/test/integration/diffing3/expected/.git_keep/logs/HEAD b/test/integration/diffing3/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/diffing3/expected/.git_keep/logs/HEAD rename to test/integration/diffing3/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing3/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/diffing3/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/diffing3/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing3/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/diffing3/expected/.git_keep/logs/refs/heads/master rename to test/integration/diffing3/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing3/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/diffing3/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 b/test/integration/diffing3/expected/repo/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 rename to test/integration/diffing3/expected/repo/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 diff --git a/test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/diffing3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/diffing3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a b/test/integration/diffing3/expected/repo/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a rename to test/integration/diffing3/expected/repo/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a diff --git a/test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 b/test/integration/diffing3/expected/repo/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 rename to test/integration/diffing3/expected/repo/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 diff --git a/test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing3/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/diffing3/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/diffing3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/diffing3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing3/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/diffing3/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/diffing3/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/diffing3/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/diffing3/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee b/test/integration/diffing3/expected/repo/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee rename to test/integration/diffing3/expected/repo/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee diff --git a/test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 b/test/integration/diffing3/expected/repo/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 rename to test/integration/diffing3/expected/repo/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 diff --git a/test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing3/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/diffing3/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing3/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/diffing3/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 b/test/integration/diffing3/expected/repo/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 rename to test/integration/diffing3/expected/repo/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 diff --git a/test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/diffing3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/diffing3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/diffing3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b b/test/integration/diffing3/expected/repo/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b rename to test/integration/diffing3/expected/repo/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b diff --git a/test/integration/diffing3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/diffing3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/diffing3/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing3/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/diffing3/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing3/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/diffing3/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 b/test/integration/diffing3/expected/repo/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 rename to test/integration/diffing3/expected/repo/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 diff --git a/test/integration/diffing3/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing3/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/diffing3/expected/.git_keep/refs/heads/branch2 rename to test/integration/diffing3/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/diffing3/expected/.git_keep/refs/heads/master b/test/integration/diffing3/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/diffing3/expected/.git_keep/refs/heads/master rename to test/integration/diffing3/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/diffing3/expected/file0 b/test/integration/diffing3/expected/repo/file0 similarity index 100% rename from test/integration/diffing3/expected/file0 rename to test/integration/diffing3/expected/repo/file0 diff --git a/test/integration/diffing3/expected/file1 b/test/integration/diffing3/expected/repo/file1 similarity index 100% rename from test/integration/diffing3/expected/file1 rename to test/integration/diffing3/expected/repo/file1 diff --git a/test/integration/diffing3/expected/file2 b/test/integration/diffing3/expected/repo/file2 similarity index 100% rename from test/integration/diffing3/expected/file2 rename to test/integration/diffing3/expected/repo/file2 diff --git a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG b/test/integration/discardFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/discardFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/discardFileChanges/expected/.git_keep/FETCH_HEAD b/test/integration/discardFileChanges/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/FETCH_HEAD rename to test/integration/discardFileChanges/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/discardFileChanges/expected/.git_keep/HEAD b/test/integration/discardFileChanges/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/HEAD rename to test/integration/discardFileChanges/expected/repo/.git_keep/HEAD diff --git a/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD b/test/integration/discardFileChanges/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD rename to test/integration/discardFileChanges/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/discardFileChanges/expected/.git_keep/config b/test/integration/discardFileChanges/expected/repo/.git_keep/config similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/config rename to test/integration/discardFileChanges/expected/repo/.git_keep/config diff --git a/test/integration/discardFileChanges/expected/.git_keep/description b/test/integration/discardFileChanges/expected/repo/.git_keep/description similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/description rename to test/integration/discardFileChanges/expected/repo/.git_keep/description diff --git a/test/integration/discardFileChanges/expected/.git_keep/index b/test/integration/discardFileChanges/expected/repo/.git_keep/index similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/index rename to test/integration/discardFileChanges/expected/repo/.git_keep/index diff --git a/test/integration/discardFileChanges/expected/.git_keep/info/exclude b/test/integration/discardFileChanges/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/info/exclude rename to test/integration/discardFileChanges/expected/repo/.git_keep/info/exclude diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD b/test/integration/discardFileChanges/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/logs/HEAD rename to test/integration/discardFileChanges/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict b/test/integration/discardFileChanges/expected/repo/.git_keep/logs/refs/heads/conflict similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict rename to test/integration/discardFileChanges/expected/repo/.git_keep/logs/refs/heads/conflict diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/repo/.git_keep/logs/refs/heads/conflict_second similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second rename to test/integration/discardFileChanges/expected/repo/.git_keep/logs/refs/heads/conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/15/fe7f43604da957ffb663b4db95b60d0af66469 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/15/fe7f43604da957ffb663b4db95b60d0af66469 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/15/fe7f43604da957ffb663b4db95b60d0af66469 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/15/fe7f43604da957ffb663b4db95b60d0af66469 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/1c/9488b0e1b8abd1ec8645b3345bdac91290b464 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/1c/9488b0e1b8abd1ec8645b3345bdac91290b464 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/1c/9488b0e1b8abd1ec8645b3345bdac91290b464 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/1c/9488b0e1b8abd1ec8645b3345bdac91290b464 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/26/80cfddbd9fa03c059ac60d2bec5e59a1c34281 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/26/80cfddbd9fa03c059ac60d2bec5e59a1c34281 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/26/80cfddbd9fa03c059ac60d2bec5e59a1c34281 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/26/80cfddbd9fa03c059ac60d2bec5e59a1c34281 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/2c/e75e2a24f7d6841a504cf3616ef5a59edb3a2d b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/2c/e75e2a24f7d6841a504cf3616ef5a59edb3a2d similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/2c/e75e2a24f7d6841a504cf3616ef5a59edb3a2d rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/2c/e75e2a24f7d6841a504cf3616ef5a59edb3a2d diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/30/07c9c07bf80aaa72b1f1f704e7fea622446678 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/30/07c9c07bf80aaa72b1f1f704e7fea622446678 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/30/07c9c07bf80aaa72b1f1f704e7fea622446678 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/30/07c9c07bf80aaa72b1f1f704e7fea622446678 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/3f/7bd8f68987d4e16b8f6fa7f6b0738b42180d1f b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/3f/7bd8f68987d4e16b8f6fa7f6b0738b42180d1f similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/3f/7bd8f68987d4e16b8f6fa7f6b0738b42180d1f rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/3f/7bd8f68987d4e16b8f6fa7f6b0738b42180d1f diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/47/966dcaa8ee736e89279b895faf8707de898e04 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/47/966dcaa8ee736e89279b895faf8707de898e04 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/47/966dcaa8ee736e89279b895faf8707de898e04 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/47/966dcaa8ee736e89279b895faf8707de898e04 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/48/f9387742d3cc3017c1a7e292c9187e35321753 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/48/f9387742d3cc3017c1a7e292c9187e35321753 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/48/f9387742d3cc3017c1a7e292c9187e35321753 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/48/f9387742d3cc3017c1a7e292c9187e35321753 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/4d/8452fc76beed0c7b15e40e45d06922bf746c5f b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/4d/8452fc76beed0c7b15e40e45d06922bf746c5f similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/4d/8452fc76beed0c7b15e40e45d06922bf746c5f rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/4d/8452fc76beed0c7b15e40e45d06922bf746c5f diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/59/cf7b78af9aab84813bcb0bc8be27fdd9216b2b b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/59/cf7b78af9aab84813bcb0bc8be27fdd9216b2b similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/59/cf7b78af9aab84813bcb0bc8be27fdd9216b2b rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/59/cf7b78af9aab84813bcb0bc8be27fdd9216b2b diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/5b/e4a414b32cf4204f889469942986d3d783da84 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/5b/e4a414b32cf4204f889469942986d3d783da84 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/5b/e4a414b32cf4204f889469942986d3d783da84 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/5b/e4a414b32cf4204f889469942986d3d783da84 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/7a/22af9d1908d85e3c4b6d916a9b6c733c55c990 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/7a/22af9d1908d85e3c4b6d916a9b6c733c55c990 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/7a/22af9d1908d85e3c4b6d916a9b6c733c55c990 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/7a/22af9d1908d85e3c4b6d916a9b6c733c55c990 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/85/4f08fa802293e0679d07771547fe9fe5d159e8 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/85/4f08fa802293e0679d07771547fe9fe5d159e8 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/85/4f08fa802293e0679d07771547fe9fe5d159e8 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/85/4f08fa802293e0679d07771547fe9fe5d159e8 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/89/44a13fdfc597e4cf1d23797df51977680f8e77 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/89/44a13fdfc597e4cf1d23797df51977680f8e77 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/89/44a13fdfc597e4cf1d23797df51977680f8e77 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/89/44a13fdfc597e4cf1d23797df51977680f8e77 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/90/7b308167f0880fb2a5c0e1614bb0c7620f9dc3 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/90/7b308167f0880fb2a5c0e1614bb0c7620f9dc3 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/90/7b308167f0880fb2a5c0e1614bb0c7620f9dc3 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/90/7b308167f0880fb2a5c0e1614bb0c7620f9dc3 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/90/be1f3056c4f471f977a28497b8d4b392c55a02 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/90/be1f3056c4f471f977a28497b8d4b392c55a02 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/90/be1f3056c4f471f977a28497b8d4b392c55a02 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/90/be1f3056c4f471f977a28497b8d4b392c55a02 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/98/e834e9cdae1191de7fafb2b6f334bddd0793e8 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/98/e834e9cdae1191de7fafb2b6f334bddd0793e8 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/98/e834e9cdae1191de7fafb2b6f334bddd0793e8 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/98/e834e9cdae1191de7fafb2b6f334bddd0793e8 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/9f/5118ee216a6e44728305f90633b0c0e2ad235c b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/9f/5118ee216a6e44728305f90633b0c0e2ad235c similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/9f/5118ee216a6e44728305f90633b0c0e2ad235c rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/9f/5118ee216a6e44728305f90633b0c0e2ad235c diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/a1/be04124078e38a592c153942bf75edf210f1ed b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/a1/be04124078e38a592c153942bf75edf210f1ed similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/a1/be04124078e38a592c153942bf75edf210f1ed rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/a1/be04124078e38a592c153942bf75edf210f1ed diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/a1/e09c2fda67b9f8d4440073c0c33f6e45689b7c b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/a1/e09c2fda67b9f8d4440073c0c33f6e45689b7c similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/a1/e09c2fda67b9f8d4440073c0c33f6e45689b7c rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/a1/e09c2fda67b9f8d4440073c0c33f6e45689b7c diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/ab/addc0b9edd523c69166a2c9f3a9e31a4c873e3 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/ab/addc0b9edd523c69166a2c9f3a9e31a4c873e3 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/ab/addc0b9edd523c69166a2c9f3a9e31a4c873e3 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/ab/addc0b9edd523c69166a2c9f3a9e31a4c873e3 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/ce/e08babc6b109f011f42eaba5f79e6e693c09e7 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/ce/e08babc6b109f011f42eaba5f79e6e693c09e7 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/ce/e08babc6b109f011f42eaba5f79e6e693c09e7 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/ce/e08babc6b109f011f42eaba5f79e6e693c09e7 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/d4/d1b67951582a751c12ff7ea29ede7d37fd9ee8 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/d4/d1b67951582a751c12ff7ea29ede7d37fd9ee8 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/d4/d1b67951582a751c12ff7ea29ede7d37fd9ee8 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/d4/d1b67951582a751c12ff7ea29ede7d37fd9ee8 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/d7/98b86744c3997c186e0f0dc666f02943c797a7 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/d7/98b86744c3997c186e0f0dc666f02943c797a7 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/d7/98b86744c3997c186e0f0dc666f02943c797a7 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/d7/98b86744c3997c186e0f0dc666f02943c797a7 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/e9/55de60e73263440d4651e79e947ec8b2902373 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/e9/55de60e73263440d4651e79e947ec8b2902373 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/e9/55de60e73263440d4651e79e947ec8b2902373 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/e9/55de60e73263440d4651e79e947ec8b2902373 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/fa/938d99f6ee5cc562cd0f33fa64fd68d78ce2e9 b/test/integration/discardFileChanges/expected/repo/.git_keep/objects/fa/938d99f6ee5cc562cd0f33fa64fd68d78ce2e9 similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/objects/fa/938d99f6ee5cc562cd0f33fa64fd68d78ce2e9 rename to test/integration/discardFileChanges/expected/repo/.git_keep/objects/fa/938d99f6ee5cc562cd0f33fa64fd68d78ce2e9 diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict b/test/integration/discardFileChanges/expected/repo/.git_keep/refs/heads/conflict similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict rename to test/integration/discardFileChanges/expected/repo/.git_keep/refs/heads/conflict diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/repo/.git_keep/refs/heads/conflict_second similarity index 100% rename from test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second rename to test/integration/discardFileChanges/expected/repo/.git_keep/refs/heads/conflict_second diff --git a/test/integration/discardFileChanges/expected/both-added.txt b/test/integration/discardFileChanges/expected/repo/both-added.txt similarity index 100% rename from test/integration/discardFileChanges/expected/both-added.txt rename to test/integration/discardFileChanges/expected/repo/both-added.txt diff --git a/test/integration/discardFileChanges/expected/both-modded.txt b/test/integration/discardFileChanges/expected/repo/both-modded.txt similarity index 100% rename from test/integration/discardFileChanges/expected/both-modded.txt rename to test/integration/discardFileChanges/expected/repo/both-modded.txt diff --git a/test/integration/discardFileChanges/expected/change-delete.txt b/test/integration/discardFileChanges/expected/repo/change-delete.txt similarity index 100% rename from test/integration/discardFileChanges/expected/change-delete.txt rename to test/integration/discardFileChanges/expected/repo/change-delete.txt diff --git a/test/integration/discardFileChanges/expected/changed-them-added-us.txt b/test/integration/discardFileChanges/expected/repo/changed-them-added-us.txt similarity index 100% rename from test/integration/discardFileChanges/expected/changed-them-added-us.txt rename to test/integration/discardFileChanges/expected/repo/changed-them-added-us.txt diff --git a/test/integration/discardFileChanges/expected/delete-change.txt b/test/integration/discardFileChanges/expected/repo/delete-change.txt similarity index 100% rename from test/integration/discardFileChanges/expected/delete-change.txt rename to test/integration/discardFileChanges/expected/repo/delete-change.txt diff --git a/test/integration/discardFileChanges/expected/deleted-staged.txt b/test/integration/discardFileChanges/expected/repo/deleted-staged.txt similarity index 100% rename from test/integration/discardFileChanges/expected/deleted-staged.txt rename to test/integration/discardFileChanges/expected/repo/deleted-staged.txt diff --git a/test/integration/discardFileChanges/expected/deleted-them.txt b/test/integration/discardFileChanges/expected/repo/deleted-them.txt similarity index 100% rename from test/integration/discardFileChanges/expected/deleted-them.txt rename to test/integration/discardFileChanges/expected/repo/deleted-them.txt diff --git a/test/integration/discardFileChanges/expected/deleted.txt b/test/integration/discardFileChanges/expected/repo/deleted.txt similarity index 100% rename from test/integration/discardFileChanges/expected/deleted.txt rename to test/integration/discardFileChanges/expected/repo/deleted.txt diff --git a/test/integration/discardFileChanges/expected/double-modded.txt b/test/integration/discardFileChanges/expected/repo/double-modded.txt similarity index 100% rename from test/integration/discardFileChanges/expected/double-modded.txt rename to test/integration/discardFileChanges/expected/repo/double-modded.txt diff --git a/test/integration/discardFileChanges/expected/modded-staged.txt b/test/integration/discardFileChanges/expected/repo/modded-staged.txt similarity index 100% rename from test/integration/discardFileChanges/expected/modded-staged.txt rename to test/integration/discardFileChanges/expected/repo/modded-staged.txt diff --git a/test/integration/discardFileChanges/expected/modded.txt b/test/integration/discardFileChanges/expected/repo/modded.txt similarity index 100% rename from test/integration/discardFileChanges/expected/modded.txt rename to test/integration/discardFileChanges/expected/repo/modded.txt diff --git a/test/integration/discardFileChanges/expected/renamed.txt b/test/integration/discardFileChanges/expected/repo/renamed.txt similarity index 100% rename from test/integration/discardFileChanges/expected/renamed.txt rename to test/integration/discardFileChanges/expected/repo/renamed.txt diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/COMMIT_EDITMSG b/test/integration/discardOldFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/FETCH_HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/FETCH_HEAD rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/HEAD rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/HEAD diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/ORIG_HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/ORIG_HEAD rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/config b/test/integration/discardOldFileChanges/expected/repo/.git_keep/config similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/config rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/config diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/description b/test/integration/discardOldFileChanges/expected/repo/.git_keep/description similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/description rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/description diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/index b/test/integration/discardOldFileChanges/expected/repo/.git_keep/index similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/index rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/index diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/info/exclude b/test/integration/discardOldFileChanges/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/info/exclude rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/info/exclude diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/logs/HEAD b/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/logs/HEAD rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/logs/refs/heads/master b/test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/logs/refs/heads/master rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/00/cbccfd35a05ef9373bba9d5633cf6e67f83dd5 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/18/e987d34afb121659724591cd709e2a789184fc diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/22/5ad83faa797c1831a2bc956a21e2d472f21443 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/42/786aead9ca20a3427c38e5e5262fa787ce9868 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/78/80a9728615a4d196df39600a0c8c71b40d96d6 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/78/80a9728615a4d196df39600a0c8c71b40d96d6 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/78/80a9728615a4d196df39600a0c8c71b40d96d6 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/78/80a9728615a4d196df39600a0c8c71b40d96d6 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/7b/8a8396be4352039598acb43acaadc1c380551f diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/d1/4505f281a54cda96fc5fb8cd4b4ee14bae6264 diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/discardOldFileChanges/expected/.git_keep/refs/heads/master b/test/integration/discardOldFileChanges/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/discardOldFileChanges/expected/.git_keep/refs/heads/master rename to test/integration/discardOldFileChanges/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/discardOldFileChanges/expected/file0 b/test/integration/discardOldFileChanges/expected/repo/file0 similarity index 100% rename from test/integration/discardOldFileChanges/expected/file0 rename to test/integration/discardOldFileChanges/expected/repo/file0 diff --git a/test/integration/discardOldFileChanges/expected/file1 b/test/integration/discardOldFileChanges/expected/repo/file1 similarity index 100% rename from test/integration/discardOldFileChanges/expected/file1 rename to test/integration/discardOldFileChanges/expected/repo/file1 diff --git a/test/integration/discardOldFileChanges/expected/file2 b/test/integration/discardOldFileChanges/expected/repo/file2 similarity index 100% rename from test/integration/discardOldFileChanges/expected/file2 rename to test/integration/discardOldFileChanges/expected/repo/file2 diff --git a/test/integration/discardOldFileChanges/expected/file3 b/test/integration/discardOldFileChanges/expected/repo/file3 similarity index 100% rename from test/integration/discardOldFileChanges/expected/file3 rename to test/integration/discardOldFileChanges/expected/repo/file3 diff --git a/test/integration/fetchPrune/expected/.git_keep/FETCH_HEAD b/test/integration/fetchPrune/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 8ef89fd5e..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 branch 'master' of ../actual_remote diff --git a/test/integration/fetchPrune/expected/.git_keep/index b/test/integration/fetchPrune/expected/.git_keep/index deleted file mode 100644 index 35b2e51a4..000000000 Binary files a/test/integration/fetchPrune/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/fetchPrune/expected/.git_keep/logs/HEAD b/test/integration/fetchPrune/expected/.git_keep/logs/HEAD deleted file mode 100644 index eac6e78df..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 CI 1648290937 +1100 commit (initial): myfile1 -f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 CI 1648290937 +1100 checkout: moving from master to other_branch -f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 CI 1648290937 +1100 checkout: moving from other_branch to master diff --git a/test/integration/fetchPrune/expected/.git_keep/logs/refs/heads/master b/test/integration/fetchPrune/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 94180e0b5..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 CI 1648290937 +1100 commit (initial): myfile1 diff --git a/test/integration/fetchPrune/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/fetchPrune/expected/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index 7cd5bcbce..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 CI 1648290937 +1100 branch: Created from HEAD diff --git a/test/integration/fetchPrune/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/fetchPrune/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 225a60ab5..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 CI 1648290938 +1100 fetch origin: storing head diff --git a/test/integration/fetchPrune/expected/.git_keep/objects/f3/ff4de48fa4e8fdb4f3631e58841ba81047d8f1 b/test/integration/fetchPrune/expected/.git_keep/objects/f3/ff4de48fa4e8fdb4f3631e58841ba81047d8f1 deleted file mode 100644 index 3d352742a..000000000 Binary files a/test/integration/fetchPrune/expected/.git_keep/objects/f3/ff4de48fa4e8fdb4f3631e58841ba81047d8f1 and /dev/null differ diff --git a/test/integration/fetchPrune/expected/.git_keep/refs/heads/master b/test/integration/fetchPrune/expected/.git_keep/refs/heads/master deleted file mode 100644 index 0725115bd..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 diff --git a/test/integration/fetchPrune/expected/.git_keep/refs/heads/other_branch b/test/integration/fetchPrune/expected/.git_keep/refs/heads/other_branch deleted file mode 100644 index 0725115bd..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 diff --git a/test/integration/fetchPrune/expected/.git_keep/refs/remotes/origin/master b/test/integration/fetchPrune/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 0725115bd..000000000 --- a/test/integration/fetchPrune/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 diff --git a/test/integration/fetchPrune/expected/.git_keep/HEAD b/test/integration/fetchPrune/expected/origin/HEAD similarity index 100% rename from test/integration/fetchPrune/expected/.git_keep/HEAD rename to test/integration/fetchPrune/expected/origin/HEAD diff --git a/test/integration/fetchPrune/expected/origin/config b/test/integration/fetchPrune/expected/origin/config new file mode 100644 index 000000000..4caf7663f --- /dev/null +++ b/test/integration/fetchPrune/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/fetchPrune/actual/./repo diff --git a/test/integration/fetchPrune/expected/.git_keep/description b/test/integration/fetchPrune/expected/origin/description similarity index 100% rename from test/integration/fetchPrune/expected/.git_keep/description rename to test/integration/fetchPrune/expected/origin/description diff --git a/test/integration/fetchPrune/expected/.git_keep/info/exclude b/test/integration/fetchPrune/expected/origin/info/exclude similarity index 100% rename from test/integration/fetchPrune/expected/.git_keep/info/exclude rename to test/integration/fetchPrune/expected/origin/info/exclude diff --git a/test/integration/fetchPrune/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/fetchPrune/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 b/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 new file mode 100644 index 000000000..965fc5498 --- /dev/null +++ b/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 @@ -0,0 +1,3 @@ +xÍA +Â0@Q×9ÅìɤÓI¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð¯š +‘bâ’0ÖH …©Jƒ“w¶¦nÓüÐØkÓKnvdJÃ"#œ½wG=&]ÿäξuÝÝ2Ž,Ï \ No newline at end of file diff --git a/test/integration/fetchPrune/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/fetchPrune/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/fetchPrune/expected/origin/packed-refs b/test/integration/fetchPrune/expected/origin/packed-refs new file mode 100644 index 000000000..37e4528a7 --- /dev/null +++ b/test/integration/fetchPrune/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 refs/heads/master diff --git a/test/integration/fetchPrune/expected/.git_keep/COMMIT_EDITMSG b/test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/fetchPrune/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..800c8511d --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 branch 'master' of ../origin diff --git a/test/integration/fetchPrune/expected_remote/HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/fetchPrune/expected_remote/HEAD rename to test/integration/fetchPrune/expected/repo/.git_keep/HEAD diff --git a/test/integration/fetchPrune/expected/.git_keep/config b/test/integration/fetchPrune/expected/repo/.git_keep/config similarity index 94% rename from test/integration/fetchPrune/expected/.git_keep/config rename to test/integration/fetchPrune/expected/repo/.git_keep/config index 6dfad7326..957eae48a 100644 --- a/test/integration/fetchPrune/expected/.git_keep/config +++ b/test/integration/fetchPrune/expected/repo/.git_keep/config @@ -11,7 +11,7 @@ [fetch] prune = true [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/fetchPrune/expected_remote/description b/test/integration/fetchPrune/expected/repo/.git_keep/description similarity index 100% rename from test/integration/fetchPrune/expected_remote/description rename to test/integration/fetchPrune/expected/repo/.git_keep/description diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/index b/test/integration/fetchPrune/expected/repo/.git_keep/index new file mode 100644 index 000000000..6955ab197 Binary files /dev/null and b/test/integration/fetchPrune/expected/repo/.git_keep/index differ diff --git a/test/integration/fetchPrune/expected_remote/info/exclude b/test/integration/fetchPrune/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/fetchPrune/expected_remote/info/exclude rename to test/integration/fetchPrune/expected/repo/.git_keep/info/exclude diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..639cde24f --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 commit (initial): myfile1 +75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 checkout: moving from master to other_branch +75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 checkout: moving from other_branch to master diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..f44229efe --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 commit (initial): myfile1 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..01e383d7f --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 branch: Created from HEAD diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..7fe249171 --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 fetch origin: storing head diff --git a/test/integration/fetchPrune/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/fetchPrune/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 new file mode 100644 index 000000000..965fc5498 --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 @@ -0,0 +1,3 @@ +xÍA +Â0@Q×9ÅìɤÓI¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð¯š +‘bâ’0ÖH …©Jƒ“w¶¦nÓüÐØkÓKnvdJÃ"#œ½wG=&]ÿäξuÝÝ2Ž,Ï \ No newline at end of file diff --git a/test/integration/fetchPrune/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/fetchPrune/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/fetchPrune/expected/.git_keep/packed-refs b/test/integration/fetchPrune/expected/repo/.git_keep/packed-refs similarity index 100% rename from test/integration/fetchPrune/expected/.git_keep/packed-refs rename to test/integration/fetchPrune/expected/repo/.git_keep/packed-refs diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..817ade7eb --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..817ade7eb --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..817ade7eb --- /dev/null +++ b/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/myfile1 b/test/integration/fetchPrune/expected/repo/myfile1 similarity index 100% rename from test/integration/fetchPrune/expected/myfile1 rename to test/integration/fetchPrune/expected/repo/myfile1 diff --git a/test/integration/fetchPrune/expected_remote/objects/f3/ff4de48fa4e8fdb4f3631e58841ba81047d8f1 b/test/integration/fetchPrune/expected_remote/objects/f3/ff4de48fa4e8fdb4f3631e58841ba81047d8f1 deleted file mode 100644 index 3d352742a..000000000 Binary files a/test/integration/fetchPrune/expected_remote/objects/f3/ff4de48fa4e8fdb4f3631e58841ba81047d8f1 and /dev/null differ diff --git a/test/integration/fetchPrune/expected_remote/packed-refs b/test/integration/fetchPrune/expected_remote/packed-refs deleted file mode 100644 index 0488de20d..000000000 --- a/test/integration/fetchPrune/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -f3ff4de48fa4e8fdb4f3631e58841ba81047d8f1 refs/heads/master diff --git a/test/integration/fetchPrune/setup.sh b/test/integration/fetchPrune/setup.sh index 19d0beec7..87829a2e3 100644 --- a/test/integration/fetchPrune/setup.sh +++ b/test/integration/fetchPrune/setup.sh @@ -20,15 +20,15 @@ git checkout -b other_branch git checkout master cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master git branch --set-upstream-to=origin/other_branch other_branch # unbenownst to our test repo we're removing the branch on the remote, so upon # fetching with prune: true we expect git to realise the remote branch is gone -git -C ../actual_remote branch -d other_branch +git -C ../origin branch -d other_branch diff --git a/test/integration/fetchPrune/test.json b/test/integration/fetchPrune/test.json index e358a8c9a..3d696e153 100644 --- a/test/integration/fetchPrune/test.json +++ b/test/integration/fetchPrune/test.json @@ -1,4 +1,4 @@ { - "description": "fetch from the remote with the 'prune' option set in the git config", + "description": "fetch from the remote with the 'prune' option set in the git config. Note this has a false positive until we find a way to show ls-remote origin in all tests when creating snapshots.", "speed": 10 } diff --git a/test/integration/filterPath/expected/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/filterPath/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/filterPath/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/filterPath/expected/.git_keep/FETCH_HEAD b/test/integration/filterPath/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/filterPath/expected/.git_keep/FETCH_HEAD rename to test/integration/filterPath/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/filterPath/expected/.git_keep/HEAD b/test/integration/filterPath/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/filterPath/expected/.git_keep/HEAD rename to test/integration/filterPath/expected/repo/.git_keep/HEAD diff --git a/test/integration/filterPath/expected/.git_keep/config b/test/integration/filterPath/expected/repo/.git_keep/config similarity index 100% rename from test/integration/filterPath/expected/.git_keep/config rename to test/integration/filterPath/expected/repo/.git_keep/config diff --git a/test/integration/filterPath/expected/.git_keep/description b/test/integration/filterPath/expected/repo/.git_keep/description similarity index 100% rename from test/integration/filterPath/expected/.git_keep/description rename to test/integration/filterPath/expected/repo/.git_keep/description diff --git a/test/integration/filterPath/expected/.git_keep/index b/test/integration/filterPath/expected/repo/.git_keep/index similarity index 100% rename from test/integration/filterPath/expected/.git_keep/index rename to test/integration/filterPath/expected/repo/.git_keep/index diff --git a/test/integration/filterPath/expected/.git_keep/info/exclude b/test/integration/filterPath/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/filterPath/expected/.git_keep/info/exclude rename to test/integration/filterPath/expected/repo/.git_keep/info/exclude diff --git a/test/integration/filterPath/expected/.git_keep/logs/HEAD b/test/integration/filterPath/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/filterPath/expected/.git_keep/logs/HEAD rename to test/integration/filterPath/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/filterPath/expected/.git_keep/logs/refs/heads/master rename to test/integration/filterPath/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/filterPath/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/filterPath/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/filterPath/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/filterPath/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/filterPath/expected/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb b/test/integration/filterPath/expected/repo/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb rename to test/integration/filterPath/expected/repo/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb diff --git a/test/integration/filterPath/expected/.git_keep/objects/2e/a97a56215f6adbe991eaf0dcf61c7086880ea5 b/test/integration/filterPath/expected/repo/.git_keep/objects/2e/a97a56215f6adbe991eaf0dcf61c7086880ea5 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/2e/a97a56215f6adbe991eaf0dcf61c7086880ea5 rename to test/integration/filterPath/expected/repo/.git_keep/objects/2e/a97a56215f6adbe991eaf0dcf61c7086880ea5 diff --git a/test/integration/filterPath/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/filterPath/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 b/test/integration/filterPath/expected/repo/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 rename to test/integration/filterPath/expected/repo/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 diff --git a/test/integration/filterPath/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 rename to test/integration/filterPath/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 diff --git a/test/integration/filterPath/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 b/test/integration/filterPath/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 rename to test/integration/filterPath/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 diff --git a/test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 b/test/integration/filterPath/expected/repo/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 rename to test/integration/filterPath/expected/repo/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 diff --git a/test/integration/filterPath/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/filterPath/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/filterPath/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/filterPath/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/filterPath/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/filterPath/expected/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 b/test/integration/filterPath/expected/repo/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 rename to test/integration/filterPath/expected/repo/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 diff --git a/test/integration/filterPath/expected/.git_keep/objects/b7/c728d5b4e9dfc210ec19f0549f25c94b766e4e b/test/integration/filterPath/expected/repo/.git_keep/objects/b7/c728d5b4e9dfc210ec19f0549f25c94b766e4e similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/b7/c728d5b4e9dfc210ec19f0549f25c94b766e4e rename to test/integration/filterPath/expected/repo/.git_keep/objects/b7/c728d5b4e9dfc210ec19f0549f25c94b766e4e diff --git a/test/integration/filterPath/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/filterPath/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/filterPath/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/filterPath/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/filterPath/expected/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b b/test/integration/filterPath/expected/repo/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b rename to test/integration/filterPath/expected/repo/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b diff --git a/test/integration/filterPath/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/filterPath/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/filterPath/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 b/test/integration/filterPath/expected/repo/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 rename to test/integration/filterPath/expected/repo/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 diff --git a/test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de b/test/integration/filterPath/expected/repo/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de similarity index 100% rename from test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de rename to test/integration/filterPath/expected/repo/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de diff --git a/test/integration/filterPath/expected/.git_keep/refs/heads/master b/test/integration/filterPath/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/filterPath/expected/.git_keep/refs/heads/master rename to test/integration/filterPath/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/filterPath/expected/file b/test/integration/filterPath/expected/repo/file similarity index 100% rename from test/integration/filterPath/expected/file rename to test/integration/filterPath/expected/repo/file diff --git a/test/integration/filterPath/expected/file0 b/test/integration/filterPath/expected/repo/file0 similarity index 100% rename from test/integration/filterPath/expected/file0 rename to test/integration/filterPath/expected/repo/file0 diff --git a/test/integration/filterPath/expected/file2 b/test/integration/filterPath/expected/repo/file2 similarity index 100% rename from test/integration/filterPath/expected/file2 rename to test/integration/filterPath/expected/repo/file2 diff --git a/test/integration/filterPath2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath2/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/filterPath2/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/filterPath2/expected/.git_keep/FETCH_HEAD b/test/integration/filterPath2/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/FETCH_HEAD rename to test/integration/filterPath2/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/filterPath2/expected/.git_keep/HEAD b/test/integration/filterPath2/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/HEAD rename to test/integration/filterPath2/expected/repo/.git_keep/HEAD diff --git a/test/integration/filterPath2/expected/.git_keep/config b/test/integration/filterPath2/expected/repo/.git_keep/config similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/config rename to test/integration/filterPath2/expected/repo/.git_keep/config diff --git a/test/integration/filterPath2/expected/.git_keep/description b/test/integration/filterPath2/expected/repo/.git_keep/description similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/description rename to test/integration/filterPath2/expected/repo/.git_keep/description diff --git a/test/integration/filterPath2/expected/.git_keep/index b/test/integration/filterPath2/expected/repo/.git_keep/index similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/index rename to test/integration/filterPath2/expected/repo/.git_keep/index diff --git a/test/integration/filterPath2/expected/.git_keep/info/exclude b/test/integration/filterPath2/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/info/exclude rename to test/integration/filterPath2/expected/repo/.git_keep/info/exclude diff --git a/test/integration/filterPath2/expected/.git_keep/logs/HEAD b/test/integration/filterPath2/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/logs/HEAD rename to test/integration/filterPath2/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath2/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master rename to test/integration/filterPath2/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/filterPath2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/filterPath2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c b/test/integration/filterPath2/expected/repo/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c rename to test/integration/filterPath2/expected/repo/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c diff --git a/test/integration/filterPath2/expected/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 b/test/integration/filterPath2/expected/repo/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath2/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 b/test/integration/filterPath2/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 b/test/integration/filterPath2/expected/repo/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/filterPath2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/filterPath2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/filterPath2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 b/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 b/test/integration/filterPath2/expected/repo/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 b/test/integration/filterPath2/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/filterPath2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/filterPath2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 b/test/integration/filterPath2/expected/repo/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 rename to test/integration/filterPath2/expected/repo/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 diff --git a/test/integration/filterPath2/expected/.git_keep/refs/heads/master b/test/integration/filterPath2/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/filterPath2/expected/.git_keep/refs/heads/master rename to test/integration/filterPath2/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/filterPath2/expected/file b/test/integration/filterPath2/expected/repo/file similarity index 100% rename from test/integration/filterPath2/expected/file rename to test/integration/filterPath2/expected/repo/file diff --git a/test/integration/filterPath2/expected/file0 b/test/integration/filterPath2/expected/repo/file0 similarity index 100% rename from test/integration/filterPath2/expected/file0 rename to test/integration/filterPath2/expected/repo/file0 diff --git a/test/integration/filterPath2/expected/file1 b/test/integration/filterPath2/expected/repo/file1 similarity index 100% rename from test/integration/filterPath2/expected/file1 rename to test/integration/filterPath2/expected/repo/file1 diff --git a/test/integration/filterPath2/expected/file2 b/test/integration/filterPath2/expected/repo/file2 similarity index 100% rename from test/integration/filterPath2/expected/file2 rename to test/integration/filterPath2/expected/repo/file2 diff --git a/test/integration/filterPath3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath3/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/filterPath3/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/filterPath3/expected/.git_keep/FETCH_HEAD b/test/integration/filterPath3/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/FETCH_HEAD rename to test/integration/filterPath3/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/filterPath3/expected/.git_keep/HEAD b/test/integration/filterPath3/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/HEAD rename to test/integration/filterPath3/expected/repo/.git_keep/HEAD diff --git a/test/integration/filterPath3/expected/.git_keep/config b/test/integration/filterPath3/expected/repo/.git_keep/config similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/config rename to test/integration/filterPath3/expected/repo/.git_keep/config diff --git a/test/integration/filterPath3/expected/.git_keep/description b/test/integration/filterPath3/expected/repo/.git_keep/description similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/description rename to test/integration/filterPath3/expected/repo/.git_keep/description diff --git a/test/integration/filterPath3/expected/.git_keep/index b/test/integration/filterPath3/expected/repo/.git_keep/index similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/index rename to test/integration/filterPath3/expected/repo/.git_keep/index diff --git a/test/integration/filterPath3/expected/.git_keep/info/exclude b/test/integration/filterPath3/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/info/exclude rename to test/integration/filterPath3/expected/repo/.git_keep/info/exclude diff --git a/test/integration/filterPath3/expected/.git_keep/logs/HEAD b/test/integration/filterPath3/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/logs/HEAD rename to test/integration/filterPath3/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath3/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master rename to test/integration/filterPath3/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/filterPath3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 b/test/integration/filterPath3/expected/repo/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/filterPath3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 b/test/integration/filterPath3/expected/repo/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath3/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 b/test/integration/filterPath3/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 b/test/integration/filterPath3/expected/repo/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/filterPath3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/filterPath3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/filterPath3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 b/test/integration/filterPath3/expected/repo/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b b/test/integration/filterPath3/expected/repo/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b rename to test/integration/filterPath3/expected/repo/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b diff --git a/test/integration/filterPath3/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 b/test/integration/filterPath3/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/filterPath3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d b/test/integration/filterPath3/expected/repo/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d rename to test/integration/filterPath3/expected/repo/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d diff --git a/test/integration/filterPath3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/filterPath3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/filterPath3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/filterPath3/expected/.git_keep/refs/heads/master b/test/integration/filterPath3/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/filterPath3/expected/.git_keep/refs/heads/master rename to test/integration/filterPath3/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/filterPath3/expected/file b/test/integration/filterPath3/expected/repo/file similarity index 100% rename from test/integration/filterPath3/expected/file rename to test/integration/filterPath3/expected/repo/file diff --git a/test/integration/filterPath3/expected/file0 b/test/integration/filterPath3/expected/repo/file0 similarity index 100% rename from test/integration/filterPath3/expected/file0 rename to test/integration/filterPath3/expected/repo/file0 diff --git a/test/integration/filterPath3/expected/file1 b/test/integration/filterPath3/expected/repo/file1 similarity index 100% rename from test/integration/filterPath3/expected/file1 rename to test/integration/filterPath3/expected/repo/file1 diff --git a/test/integration/filterPath3/expected/file2 b/test/integration/filterPath3/expected/repo/file2 similarity index 100% rename from test/integration/filterPath3/expected/file2 rename to test/integration/filterPath3/expected/repo/file2 diff --git a/test/integration/forcePush/expected/.git_keep/FETCH_HEAD b/test/integration/forcePush/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 8997b0d11..000000000 --- a/test/integration/forcePush/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -a9848fd98935937cd7d3909023ed1b588ccd4bfb branch 'master' of ../actual_remote diff --git a/test/integration/forcePush/expected/.git_keep/ORIG_HEAD b/test/integration/forcePush/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index c081af82f..000000000 --- a/test/integration/forcePush/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -a9848fd98935937cd7d3909023ed1b588ccd4bfb diff --git a/test/integration/forcePush/expected/.git_keep/index b/test/integration/forcePush/expected/.git_keep/index deleted file mode 100644 index 84d23c3f4..000000000 Binary files a/test/integration/forcePush/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/forcePush/expected/.git_keep/logs/HEAD b/test/integration/forcePush/expected/.git_keep/logs/HEAD deleted file mode 100644 index 9cef8b360..000000000 --- a/test/integration/forcePush/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 1fe60e6b7023a1b9751850f83ac5bda49ddd9278 CI 1634897551 +1100 commit (initial): myfile1 -1fe60e6b7023a1b9751850f83ac5bda49ddd9278 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 commit: myfile2 -66bd8d357f6226ec264478db3606bc1c4be87e63 a9848fd98935937cd7d3909023ed1b588ccd4bfb CI 1634897551 +1100 commit: myfile3 -a9848fd98935937cd7d3909023ed1b588ccd4bfb 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 reset: moving to HEAD^ -66bd8d357f6226ec264478db3606bc1c4be87e63 aed1af42535c9c6a27b9f660119452328fddd7cd CI 1634897551 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/.git_keep/logs/refs/heads/master b/test/integration/forcePush/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 9cef8b360..000000000 --- a/test/integration/forcePush/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 1fe60e6b7023a1b9751850f83ac5bda49ddd9278 CI 1634897551 +1100 commit (initial): myfile1 -1fe60e6b7023a1b9751850f83ac5bda49ddd9278 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 commit: myfile2 -66bd8d357f6226ec264478db3606bc1c4be87e63 a9848fd98935937cd7d3909023ed1b588ccd4bfb CI 1634897551 +1100 commit: myfile3 -a9848fd98935937cd7d3909023ed1b588ccd4bfb 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 reset: moving to HEAD^ -66bd8d357f6226ec264478db3606bc1c4be87e63 aed1af42535c9c6a27b9f660119452328fddd7cd CI 1634897551 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 9ba3d77f4..000000000 --- a/test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 fetch origin: storing head -66bd8d357f6226ec264478db3606bc1c4be87e63 a9848fd98935937cd7d3909023ed1b588ccd4bfb CI 1634897551 +1100 update by push -a9848fd98935937cd7d3909023ed1b588ccd4bfb aed1af42535c9c6a27b9f660119452328fddd7cd CI 1634897553 +1100 update by push diff --git a/test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 b/test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 deleted file mode 100644 index 3c2c7f4e4..000000000 --- a/test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 +++ /dev/null @@ -1,5 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJF'“E -®þâËÚÚÒ:õ]Dm¢Ñzò9Ç^stRB©sfæ2¨ÔÌÉly×W‡Cjª>Ä™cÇD1ÕâÙr*š¢²7ùÝëã×qºë'·í©YÛ =¥!†€pF´ÖzLuý37í;/O%óÜ):e \ No newline at end of file diff --git a/test/integration/forcePush/expected/.git_keep/refs/heads/master b/test/integration/forcePush/expected/.git_keep/refs/heads/master deleted file mode 100644 index eaa7bcba3..000000000 --- a/test/integration/forcePush/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -aed1af42535c9c6a27b9f660119452328fddd7cd diff --git a/test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master b/test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index eaa7bcba3..000000000 --- a/test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -aed1af42535c9c6a27b9f660119452328fddd7cd diff --git a/test/integration/forcePush/expected/.git_keep/HEAD b/test/integration/forcePush/expected/origin/HEAD similarity index 100% rename from test/integration/forcePush/expected/.git_keep/HEAD rename to test/integration/forcePush/expected/origin/HEAD diff --git a/test/integration/pull/expected_remote/config b/test/integration/forcePush/expected/origin/config similarity index 78% rename from test/integration/pull/expected_remote/config rename to test/integration/forcePush/expected/origin/config index 94ceda391..5b015dc91 100644 --- a/test/integration/pull/expected_remote/config +++ b/test/integration/forcePush/expected/origin/config @@ -5,4 +5,4 @@ ignorecase = true precomposeunicode = true [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pull/./actual + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePush/actual/./repo diff --git a/test/integration/forcePush/expected/.git_keep/description b/test/integration/forcePush/expected/origin/description similarity index 100% rename from test/integration/forcePush/expected/.git_keep/description rename to test/integration/forcePush/expected/origin/description diff --git a/test/integration/forcePush/expected/.git_keep/info/exclude b/test/integration/forcePush/expected/origin/info/exclude similarity index 100% rename from test/integration/forcePush/expected/.git_keep/info/exclude rename to test/integration/forcePush/expected/origin/info/exclude diff --git a/test/integration/forcePush/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/forcePush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/forcePush/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePush/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/forcePush/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/forcePush/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/forcePush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/forcePush/expected/origin/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd b/test/integration/forcePush/expected/origin/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd new file mode 100644 index 000000000..901f43002 Binary files /dev/null and b/test/integration/forcePush/expected/origin/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd differ diff --git a/test/integration/forcePush/expected/origin/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b/test/integration/forcePush/expected/origin/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 new file mode 100644 index 000000000..6df2d79c3 --- /dev/null +++ b/test/integration/forcePush/expected/origin/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9Eö‚d’ÌtD„®zŒ¤™`ÁØR"èííÜ~ÞâÏkkK· ñÔwU›†!¡TWŠj%©™±'*ÞgW}2[ÚõÕ-"²dÉ¡°gEVÉ•„e€ÄaÆ\Lz÷ǺÛq²×qºë'µí©—ym7 9 wNìÀ9sÔcªëŸÜ´o]žêÍz9‹ \ No newline at end of file diff --git a/test/integration/forcePush/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/forcePush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/forcePush/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/forcePush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/forcePush/expected/origin/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 b/test/integration/forcePush/expected/origin/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 new file mode 100644 index 000000000..f83e70de7 --- /dev/null +++ b/test/integration/forcePush/expected/origin/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 @@ -0,0 +1,2 @@ +xŽA +Â0E]çÙ ’ɤÍD„®zŒd:ƒcK‰ ·7Gpõáñ|Þj]›…Ní±¾@D¦ ˆšªæPÉ1ÏC_³çC^ÍÆ(y!Ö”tÐ Ž‚¤^'H1‹÷L&¿Ûc;ì4Ûë4ßå“ëþ” oõfa „ƒw.Ù3€s¦Ó~ªÉŸº©_]Ÿ‚æe-;7 \ No newline at end of file diff --git a/test/integration/forcePush/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePush/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 rename to test/integration/forcePush/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 diff --git a/test/integration/forcePush/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/forcePush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/forcePush/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/forcePush/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/forcePush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/forcePush/expected/origin/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d b/test/integration/forcePush/expected/origin/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d new file mode 100644 index 000000000..5b7d7cee7 Binary files /dev/null and b/test/integration/forcePush/expected/origin/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d differ diff --git a/test/integration/forcePush/expected/origin/packed-refs b/test/integration/forcePush/expected/origin/packed-refs new file mode 100644 index 000000000..c6dbf6df8 --- /dev/null +++ b/test/integration/forcePush/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 refs/heads/master diff --git a/test/integration/forcePush/expected/origin/refs/heads/master b/test/integration/forcePush/expected/origin/refs/heads/master new file mode 100644 index 000000000..3b1a8881f --- /dev/null +++ b/test/integration/forcePush/expected/origin/refs/heads/master @@ -0,0 +1 @@ +e38b0dbe9634034957d8ebe0088587abd9ae938d diff --git a/test/integration/forcePush/expected/.git_keep/COMMIT_EDITMSG b/test/integration/forcePush/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/forcePush/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/forcePush/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/forcePush/expected/repo/.git_keep/FETCH_HEAD b/test/integration/forcePush/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e065d2487 --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +b8568c2ecaef7e2f47647057ad47b040e8c5df53 branch 'master' of ../origin diff --git a/test/integration/forcePush/expected_remote/HEAD b/test/integration/forcePush/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/forcePush/expected_remote/HEAD rename to test/integration/forcePush/expected/repo/.git_keep/HEAD diff --git a/test/integration/forcePush/expected/repo/.git_keep/ORIG_HEAD b/test/integration/forcePush/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..54eb7c04b --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +b8568c2ecaef7e2f47647057ad47b040e8c5df53 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/config b/test/integration/forcePush/expected/repo/.git_keep/config similarity index 92% rename from test/integration/pullAndSetUpstream/expected/.git_keep/config rename to test/integration/forcePush/expected/repo/.git_keep/config index 821803a3e..7721ae814 100644 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/config +++ b/test/integration/forcePush/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/forcePush/expected_remote/description b/test/integration/forcePush/expected/repo/.git_keep/description similarity index 100% rename from test/integration/forcePush/expected_remote/description rename to test/integration/forcePush/expected/repo/.git_keep/description diff --git a/test/integration/forcePush/expected/repo/.git_keep/index b/test/integration/forcePush/expected/repo/.git_keep/index new file mode 100644 index 000000000..0638abdb5 Binary files /dev/null and b/test/integration/forcePush/expected/repo/.git_keep/index differ diff --git a/test/integration/forcePush/expected_remote/info/exclude b/test/integration/forcePush/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/forcePush/expected_remote/info/exclude rename to test/integration/forcePush/expected/repo/.git_keep/info/exclude diff --git a/test/integration/forcePush/expected/repo/.git_keep/logs/HEAD b/test/integration/forcePush/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..bccf225e5 --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 5558e3589b913d8280499a5f9bf698971a83c5bd CI 1648352009 +1100 commit (initial): myfile1 +5558e3589b913d8280499a5f9bf698971a83c5bd 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 commit: myfile2 +77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b8568c2ecaef7e2f47647057ad47b040e8c5df53 CI 1648352009 +1100 commit: myfile3 +b8568c2ecaef7e2f47647057ad47b040e8c5df53 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 reset: moving to HEAD^ +77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 e38b0dbe9634034957d8ebe0088587abd9ae938d CI 1648352009 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/forcePush/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..bccf225e5 --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 5558e3589b913d8280499a5f9bf698971a83c5bd CI 1648352009 +1100 commit (initial): myfile1 +5558e3589b913d8280499a5f9bf698971a83c5bd 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 commit: myfile2 +77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b8568c2ecaef7e2f47647057ad47b040e8c5df53 CI 1648352009 +1100 commit: myfile3 +b8568c2ecaef7e2f47647057ad47b040e8c5df53 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 reset: moving to HEAD^ +77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 e38b0dbe9634034957d8ebe0088587abd9ae938d CI 1648352009 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePush/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..006c9dee8 --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 CI 1648352009 +1100 fetch origin: storing head +77ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b8568c2ecaef7e2f47647057ad47b040e8c5df53 CI 1648352009 +1100 update by push +b8568c2ecaef7e2f47647057ad47b040e8c5df53 e38b0dbe9634034957d8ebe0088587abd9ae938d CI 1648352011 +1100 update by push diff --git a/test/integration/forcePush/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/forcePush/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/forcePush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/forcePush/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePush/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/forcePush/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/forcePush/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/forcePush/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/forcePush/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/forcePush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd b/test/integration/forcePush/expected/repo/.git_keep/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd new file mode 100644 index 000000000..901f43002 Binary files /dev/null and b/test/integration/forcePush/expected/repo/.git_keep/objects/55/58e3589b913d8280499a5f9bf698971a83c5bd differ diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 b/test/integration/forcePush/expected/repo/.git_keep/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 new file mode 100644 index 000000000..6df2d79c3 --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/objects/77/ead8cf99f5fa1084e9ffa40eb18f37157b22c8 @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9Eö‚d’ÌtD„®zŒ¤™`ÁØR"èííÜ~ÞâÏkkK· ñÔwU›†!¡TWŠj%©™±'*ÞgW}2[ÚõÕ-"²dÉ¡°gEVÉ•„e€ÄaÆ\Lz÷ǺÛq²×qºë'µí©—ym7 9 wNìÀ9sÔcªëŸÜ´o]žêÍz9‹ \ No newline at end of file diff --git a/test/integration/forcePush/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/forcePush/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/forcePush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/forcePush/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/forcePush/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/forcePush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 b/test/integration/forcePush/expected/repo/.git_keep/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 new file mode 100644 index 000000000..f83e70de7 --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/objects/b8/568c2ecaef7e2f47647057ad47b040e8c5df53 @@ -0,0 +1,2 @@ +xŽA +Â0E]çÙ ’ɤÍD„®zŒd:ƒcK‰ ·7Gpõáñ|Þj]›…Ní±¾@D¦ ˆšªæPÉ1ÏC_³çC^ÍÆ(y!Ö”tÐ Ž‚¤^'H1‹÷L&¿Ûc;ì4Ûë4ßå“ëþ” oõfa „ƒw.Ù3€s¦Ó~ªÉŸº©_]Ÿ‚æe-;7 \ No newline at end of file diff --git a/test/integration/forcePush/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePush/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 similarity index 100% rename from test/integration/forcePush/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 rename to test/integration/forcePush/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 diff --git a/test/integration/forcePush/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/forcePush/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/forcePush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/forcePush/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/forcePush/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/forcePush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/forcePush/expected/repo/.git_keep/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d b/test/integration/forcePush/expected/repo/.git_keep/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d new file mode 100644 index 000000000..5b7d7cee7 Binary files /dev/null and b/test/integration/forcePush/expected/repo/.git_keep/objects/e3/8b0dbe9634034957d8ebe0088587abd9ae938d differ diff --git a/test/integration/forcePush/expected/repo/.git_keep/refs/heads/master b/test/integration/forcePush/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..3b1a8881f --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +e38b0dbe9634034957d8ebe0088587abd9ae938d diff --git a/test/integration/forcePush/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/forcePush/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..3b1a8881f --- /dev/null +++ b/test/integration/forcePush/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +e38b0dbe9634034957d8ebe0088587abd9ae938d diff --git a/test/integration/forcePush/expected/myfile1 b/test/integration/forcePush/expected/repo/myfile1 similarity index 100% rename from test/integration/forcePush/expected/myfile1 rename to test/integration/forcePush/expected/repo/myfile1 diff --git a/test/integration/forcePush/expected/myfile2 b/test/integration/forcePush/expected/repo/myfile2 similarity index 100% rename from test/integration/forcePush/expected/myfile2 rename to test/integration/forcePush/expected/repo/myfile2 diff --git a/test/integration/forcePush/expected/myfile4 b/test/integration/forcePush/expected/repo/myfile4 similarity index 100% rename from test/integration/forcePush/expected/myfile4 rename to test/integration/forcePush/expected/repo/myfile4 diff --git a/test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 b/test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 deleted file mode 100644 index 3c2c7f4e4..000000000 --- a/test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 +++ /dev/null @@ -1,5 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJF'“E -®þâËÚÚÒ:õ]Dm¢Ñzò9Ç^stRB©sfæ2¨ÔÌÉly×W‡Cjª>Ä™cÇD1ÕâÙr*š¢²7ùÝëã×qºë'·í©YÛ =¥!†€pF´ÖzLuý37í;/O%óÜ):e \ No newline at end of file diff --git a/test/integration/forcePush/expected_remote/packed-refs b/test/integration/forcePush/expected_remote/packed-refs deleted file mode 100644 index 7a7114a0a..000000000 --- a/test/integration/forcePush/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -66bd8d357f6226ec264478db3606bc1c4be87e63 refs/heads/master diff --git a/test/integration/forcePush/expected_remote/refs/heads/master b/test/integration/forcePush/expected_remote/refs/heads/master deleted file mode 100644 index eaa7bcba3..000000000 --- a/test/integration/forcePush/expected_remote/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -aed1af42535c9c6a27b9f660119452328fddd7cd diff --git a/test/integration/forcePush/setup.sh b/test/integration/forcePush/setup.sh index 74192c316..2856859ca 100644 --- a/test/integration/forcePush/setup.sh +++ b/test/integration/forcePush/setup.sh @@ -19,11 +19,11 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/forcePushMultiple/expected/.git_keep/FETCH_HEAD b/test/integration/forcePushMultiple/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index d56304e09..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1,2 +0,0 @@ -b82ed4a67bef9ef50807adf409f103ef7b0832ab branch 'master' of ../actual_remote -d3708eeec2b9d69acbe87862330e844e85f77de1 not-for-merge branch 'other_branch' of ../actual_remote diff --git a/test/integration/forcePushMultiple/expected/.git_keep/ORIG_HEAD b/test/integration/forcePushMultiple/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 3774ff3d1..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -d3708eeec2b9d69acbe87862330e844e85f77de1 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/index b/test/integration/forcePushMultiple/expected/.git_keep/index deleted file mode 100644 index 375819d60..000000000 Binary files a/test/integration/forcePushMultiple/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/forcePushMultiple/expected/.git_keep/logs/HEAD b/test/integration/forcePushMultiple/expected/.git_keep/logs/HEAD deleted file mode 100644 index 476f234fd..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 16d8875e19987b16f1991a41fd3f4536d16f7cb4 CI 1648340487 +1100 commit (initial): myfile1 -16d8875e19987b16f1991a41fd3f4536d16f7cb4 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 commit: myfile2 -42d408cffcc087da21115f9ebc29e9765a2beb83 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 checkout: moving from master to other_branch -42d408cffcc087da21115f9ebc29e9765a2beb83 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 checkout: moving from other_branch to master -42d408cffcc087da21115f9ebc29e9765a2beb83 b82ed4a67bef9ef50807adf409f103ef7b0832ab CI 1648340487 +1100 commit: myfile3 -b82ed4a67bef9ef50807adf409f103ef7b0832ab 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 reset: moving to HEAD^ -42d408cffcc087da21115f9ebc29e9765a2beb83 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 checkout: moving from master to other_branch -42d408cffcc087da21115f9ebc29e9765a2beb83 d3708eeec2b9d69acbe87862330e844e85f77de1 CI 1648340487 +1100 commit: myfile4 -d3708eeec2b9d69acbe87862330e844e85f77de1 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 reset: moving to HEAD^ -42d408cffcc087da21115f9ebc29e9765a2beb83 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 checkout: moving from other_branch to master diff --git a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/heads/master b/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 15de170c8..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 16d8875e19987b16f1991a41fd3f4536d16f7cb4 CI 1648340487 +1100 commit (initial): myfile1 -16d8875e19987b16f1991a41fd3f4536d16f7cb4 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 commit: myfile2 -42d408cffcc087da21115f9ebc29e9765a2beb83 b82ed4a67bef9ef50807adf409f103ef7b0832ab CI 1648340487 +1100 commit: myfile3 -b82ed4a67bef9ef50807adf409f103ef7b0832ab 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index 78ea80b06..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 branch: Created from HEAD -42d408cffcc087da21115f9ebc29e9765a2beb83 d3708eeec2b9d69acbe87862330e844e85f77de1 CI 1648340487 +1100 commit: myfile4 -d3708eeec2b9d69acbe87862330e844e85f77de1 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index dd0a1b736..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 fetch origin: storing head -42d408cffcc087da21115f9ebc29e9765a2beb83 b82ed4a67bef9ef50807adf409f103ef7b0832ab CI 1648340487 +1100 update by push -b82ed4a67bef9ef50807adf409f103ef7b0832ab 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340489 +1100 update by push diff --git a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/remotes/origin/other_branch b/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/remotes/origin/other_branch deleted file mode 100644 index ca4e1389e..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/logs/refs/remotes/origin/other_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340487 +1100 fetch origin: storing head -42d408cffcc087da21115f9ebc29e9765a2beb83 d3708eeec2b9d69acbe87862330e844e85f77de1 CI 1648340487 +1100 update by push -d3708eeec2b9d69acbe87862330e844e85f77de1 42d408cffcc087da21115f9ebc29e9765a2beb83 CI 1648340489 +1100 update by push diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/16/d8875e19987b16f1991a41fd3f4536d16f7cb4 b/test/integration/forcePushMultiple/expected/.git_keep/objects/16/d8875e19987b16f1991a41fd3f4536d16f7cb4 deleted file mode 100644 index b72fd3fa1..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/objects/16/d8875e19987b16f1991a41fd3f4536d16f7cb4 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙÊŒN'))¸òc2¡‚!")ØÛ×#tûyðc-ei@,—¶›šÄŒ*³XHÌFAR N){ž¹OÂYã½súiïºÃ8Ásœ^vhÙV»ÅZ áÐ3rðp%Btg='Íþä®|ó²¹3,Ó \ No newline at end of file diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/42/d408cffcc087da21115f9ebc29e9765a2beb83 b/test/integration/forcePushMultiple/expected/.git_keep/objects/42/d408cffcc087da21115f9ebc29e9765a2beb83 deleted file mode 100644 index 31d3fad7a..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/objects/42/d408cffcc087da21115f9ebc29e9765a2beb83 +++ /dev/null @@ -1,3 +0,0 @@ -xŽA -à E»öî ÅÑɨJ!«Cã Ä& ííëºû<þûüe¯um"^Úɬ“wiˆbJa–H‘)J&GÁk³‹@êH'¿ºH%?0Ä|’ !Hq‚ƒ£Ò‘_2ªônÏýÔÓ¬Çi~ð'ÕcãÛ²×{ßÀàÐ`ðú -`Œê´Ÿjüg]Õ¯¬[õŒá9· \ No newline at end of file diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/b8/2ed4a67bef9ef50807adf409f103ef7b0832ab b/test/integration/forcePushMultiple/expected/.git_keep/objects/b8/2ed4a67bef9ef50807adf409f103ef7b0832ab deleted file mode 100644 index 55c8270da..000000000 Binary files a/test/integration/forcePushMultiple/expected/.git_keep/objects/b8/2ed4a67bef9ef50807adf409f103ef7b0832ab and /dev/null differ diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/d3/708eeec2b9d69acbe87862330e844e85f77de1 b/test/integration/forcePushMultiple/expected/.git_keep/objects/d3/708eeec2b9d69acbe87862330e844e85f77de1 deleted file mode 100644 index e36f500bd..000000000 Binary files a/test/integration/forcePushMultiple/expected/.git_keep/objects/d3/708eeec2b9d69acbe87862330e844e85f77de1 and /dev/null differ diff --git a/test/integration/forcePushMultiple/expected/.git_keep/refs/heads/master b/test/integration/forcePushMultiple/expected/.git_keep/refs/heads/master deleted file mode 100644 index f9339e7e2..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -42d408cffcc087da21115f9ebc29e9765a2beb83 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/refs/heads/other_branch b/test/integration/forcePushMultiple/expected/.git_keep/refs/heads/other_branch deleted file mode 100644 index f9339e7e2..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -42d408cffcc087da21115f9ebc29e9765a2beb83 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/refs/remotes/origin/master b/test/integration/forcePushMultiple/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index f9339e7e2..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -42d408cffcc087da21115f9ebc29e9765a2beb83 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/refs/remotes/origin/other_branch b/test/integration/forcePushMultiple/expected/.git_keep/refs/remotes/origin/other_branch deleted file mode 100644 index f9339e7e2..000000000 --- a/test/integration/forcePushMultiple/expected/.git_keep/refs/remotes/origin/other_branch +++ /dev/null @@ -1 +0,0 @@ -42d408cffcc087da21115f9ebc29e9765a2beb83 diff --git a/test/integration/forcePushMultiple/expected_remote/objects/16/d8875e19987b16f1991a41fd3f4536d16f7cb4 b/test/integration/forcePushMultiple/expected_remote/objects/16/d8875e19987b16f1991a41fd3f4536d16f7cb4 deleted file mode 100644 index b72fd3fa1..000000000 --- a/test/integration/forcePushMultiple/expected_remote/objects/16/d8875e19987b16f1991a41fd3f4536d16f7cb4 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙÊŒN'))¸òc2¡‚!")ØÛ×#tûyðc-ei@,—¶›šÄŒ*³XHÌFAR N){ž¹OÂYã½súiïºÃ8Ásœ^vhÙV»ÅZ áÐ3rðp%Btg='Íþä®|ó²¹3,Ó \ No newline at end of file diff --git a/test/integration/forcePushMultiple/expected_remote/objects/42/d408cffcc087da21115f9ebc29e9765a2beb83 b/test/integration/forcePushMultiple/expected_remote/objects/42/d408cffcc087da21115f9ebc29e9765a2beb83 deleted file mode 100644 index 31d3fad7a..000000000 --- a/test/integration/forcePushMultiple/expected_remote/objects/42/d408cffcc087da21115f9ebc29e9765a2beb83 +++ /dev/null @@ -1,3 +0,0 @@ -xŽA -à E»öî ÅÑɨJ!«Cã Ä& ííëºû<þûüe¯um"^Úɬ“wiˆbJa–H‘)J&GÁk³‹@êH'¿ºH%?0Ä|’ !Hq‚ƒ£Ò‘_2ªônÏýÔÓ¬Çi~ð'ÕcãÛ²×{ßÀàÐ`ðú -`Œê´Ÿjüg]Õ¯¬[õŒá9· \ No newline at end of file diff --git a/test/integration/forcePushMultiple/expected_remote/objects/b8/2ed4a67bef9ef50807adf409f103ef7b0832ab b/test/integration/forcePushMultiple/expected_remote/objects/b8/2ed4a67bef9ef50807adf409f103ef7b0832ab deleted file mode 100644 index 55c8270da..000000000 Binary files a/test/integration/forcePushMultiple/expected_remote/objects/b8/2ed4a67bef9ef50807adf409f103ef7b0832ab and /dev/null differ diff --git a/test/integration/forcePushMultiple/expected_remote/objects/d3/708eeec2b9d69acbe87862330e844e85f77de1 b/test/integration/forcePushMultiple/expected_remote/objects/d3/708eeec2b9d69acbe87862330e844e85f77de1 deleted file mode 100644 index e36f500bd..000000000 Binary files a/test/integration/forcePushMultiple/expected_remote/objects/d3/708eeec2b9d69acbe87862330e844e85f77de1 and /dev/null differ diff --git a/test/integration/forcePushMultiple/expected_remote/packed-refs b/test/integration/forcePushMultiple/expected_remote/packed-refs deleted file mode 100644 index 07ff7e761..000000000 --- a/test/integration/forcePushMultiple/expected_remote/packed-refs +++ /dev/null @@ -1,3 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -42d408cffcc087da21115f9ebc29e9765a2beb83 refs/heads/master -42d408cffcc087da21115f9ebc29e9765a2beb83 refs/heads/other_branch diff --git a/test/integration/forcePushMultiple/expected_remote/refs/heads/master b/test/integration/forcePushMultiple/expected_remote/refs/heads/master deleted file mode 100644 index f9339e7e2..000000000 --- a/test/integration/forcePushMultiple/expected_remote/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -42d408cffcc087da21115f9ebc29e9765a2beb83 diff --git a/test/integration/forcePushMultiple/expected_remote/refs/heads/other_branch b/test/integration/forcePushMultiple/expected_remote/refs/heads/other_branch deleted file mode 100644 index f9339e7e2..000000000 --- a/test/integration/forcePushMultiple/expected_remote/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -42d408cffcc087da21115f9ebc29e9765a2beb83 diff --git a/test/integration/forcePushMultiple/recording.json b/test/integration/forcePushMultiple/recording.json deleted file mode 100644 index dd0070f15..000000000 --- a/test/integration/forcePushMultiple/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":591,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1207,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1990,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/forcePushMultiple/expected/.git_keep/HEAD b/test/integration/forcePushMultipleMatching/expected/origin/HEAD similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/HEAD rename to test/integration/forcePushMultipleMatching/expected/origin/HEAD diff --git a/test/integration/forcePushMultipleMatching/expected/origin/config b/test/integration/forcePushMultipleMatching/expected/origin/config new file mode 100644 index 000000000..41711784a --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePushMultiple/actual/./repo diff --git a/test/integration/forcePushMultiple/expected/.git_keep/description b/test/integration/forcePushMultipleMatching/expected/origin/description similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/description rename to test/integration/forcePushMultipleMatching/expected/origin/description diff --git a/test/integration/forcePushMultiple/expected/.git_keep/info/exclude b/test/integration/forcePushMultipleMatching/expected/origin/info/exclude similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/info/exclude rename to test/integration/forcePushMultipleMatching/expected/origin/info/exclude diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe b/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe new file mode 100644 index 000000000..c58bcbe9b --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJ&NÇ¥\yŒ1™PÁ!ERÐÛ×#tûyðS5[ ñ¥mªà•SñÂs?hÌDŠ‘sÄ Xzš©ËLEÒ=8ù¶wÝ`œà1N/ÝÅ>«ÞRµ' Sìh €pEôÞõœ4ý“;;ʲ*º2K,Í \ No newline at end of file diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleMatching/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/forcePushMultipleMatching/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleMatching/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/forcePushMultipleMatching/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad b/test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad new file mode 100644 index 000000000..fcaa0a878 Binary files /dev/null and b/test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad differ diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleMatching/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 rename to test/integration/forcePushMultipleMatching/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleMatching/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/forcePushMultipleMatching/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleMatching/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/forcePushMultipleMatching/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 b/test/integration/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 new file mode 100644 index 000000000..e1d86f23c Binary files /dev/null and b/test/integration/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 differ diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 b/test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 new file mode 100644 index 000000000..114e72ec5 Binary files /dev/null and b/test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 differ diff --git a/test/integration/forcePushMultipleMatching/expected/origin/packed-refs b/test/integration/forcePushMultipleMatching/expected/origin/packed-refs new file mode 100644 index 000000000..970c0dc0b --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/origin/packed-refs @@ -0,0 +1,3 @@ +# pack-refs with: peeled fully-peeled sorted +e67f344f42afdb79c87a590f22537160241d8d61 refs/heads/master +e67f344f42afdb79c87a590f22537160241d8d61 refs/heads/other_branch diff --git a/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master b/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master new file mode 100644 index 000000000..51eb490a4 --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master @@ -0,0 +1 @@ +e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch b/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch new file mode 100644 index 000000000..51eb490a4 --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch @@ -0,0 +1 @@ +e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/COMMIT_EDITMSG b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/forcePushMultiple/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..0a4e5da7e --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1,2 @@ +bd739fb752ed02ccd49422196e31599c87ff90ad branch 'master' of ../origin +fe67c3eaf819025990d3688d5f147a064e669ca5 not-for-merge branch 'other_branch' of ../origin diff --git a/test/integration/forcePushMultiple/expected_remote/HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/HEAD rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/HEAD diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..e7aee65c4 --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +fe67c3eaf819025990d3688d5f147a064e669ca5 diff --git a/test/integration/forcePushMultiple/expected/.git_keep/config b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config similarity index 94% rename from test/integration/forcePushMultiple/expected/.git_keep/config rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config index 740ff301f..2be68507e 100644 --- a/test/integration/forcePushMultiple/expected/.git_keep/config +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config @@ -11,7 +11,7 @@ [push] default = matching [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/forcePushMultiple/expected_remote/description b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/description similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/description rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/description diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/index b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/index new file mode 100644 index 000000000..5c83b42dc Binary files /dev/null and b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/index differ diff --git a/test/integration/forcePushMultiple/expected_remote/info/exclude b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/info/exclude rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/info/exclude diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..fa818156f --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 7a35f0bb6bd8dc18ae462465e51f02362ba6babe CI 1648349421 +1100 commit (initial): myfile1 +7a35f0bb6bd8dc18ae462465e51f02362ba6babe e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 commit: myfile2 +e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 checkout: moving from master to other_branch +e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 checkout: moving from other_branch to master +e67f344f42afdb79c87a590f22537160241d8d61 bd739fb752ed02ccd49422196e31599c87ff90ad CI 1648349421 +1100 commit: myfile3 +bd739fb752ed02ccd49422196e31599c87ff90ad e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 reset: moving to HEAD^ +e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 checkout: moving from master to other_branch +e67f344f42afdb79c87a590f22537160241d8d61 fe67c3eaf819025990d3688d5f147a064e669ca5 CI 1648349421 +1100 commit: myfile4 +fe67c3eaf819025990d3688d5f147a064e669ca5 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349422 +1100 reset: moving to HEAD^ +e67f344f42afdb79c87a590f22537160241d8d61 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349422 +1100 checkout: moving from other_branch to master diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..7c4a7732c --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 7a35f0bb6bd8dc18ae462465e51f02362ba6babe CI 1648349421 +1100 commit (initial): myfile1 +7a35f0bb6bd8dc18ae462465e51f02362ba6babe e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 commit: myfile2 +e67f344f42afdb79c87a590f22537160241d8d61 bd739fb752ed02ccd49422196e31599c87ff90ad CI 1648349421 +1100 commit: myfile3 +bd739fb752ed02ccd49422196e31599c87ff90ad e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..76c0be40c --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 branch: Created from HEAD +e67f344f42afdb79c87a590f22537160241d8d61 fe67c3eaf819025990d3688d5f147a064e669ca5 CI 1648349421 +1100 commit: myfile4 +fe67c3eaf819025990d3688d5f147a064e669ca5 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349422 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..f6e6b60bd --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 fetch origin: storing head +e67f344f42afdb79c87a590f22537160241d8d61 bd739fb752ed02ccd49422196e31599c87ff90ad CI 1648349421 +1100 update by push +bd739fb752ed02ccd49422196e31599c87ff90ad e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349423 +1100 update by push diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch new file mode 100644 index 000000000..5672ee50e --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349421 +1100 fetch origin: storing head +e67f344f42afdb79c87a590f22537160241d8d61 fe67c3eaf819025990d3688d5f147a064e669ca5 CI 1648349421 +1100 update by push +fe67c3eaf819025990d3688d5f147a064e669ca5 e67f344f42afdb79c87a590f22537160241d8d61 CI 1648349423 +1100 update by push diff --git a/test/integration/forcePushMultiple/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/forcePushMultiple/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/forcePushMultiple/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe new file mode 100644 index 000000000..c58bcbe9b --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJ&NÇ¥\yŒ1™PÁ!ERÐÛ×#tûyðS5[ ñ¥mªà•SñÂs?hÌDŠ‘sÄ Xzš©ËLEÒ=8ù¶wÝ`œà1N/ÝÅ>«ÞRµ' Sìh €pEôÞõœ4ý“;;ʲ*º2K,Í \ No newline at end of file diff --git a/test/integration/forcePushMultiple/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/forcePushMultiple/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad new file mode 100644 index 000000000..fcaa0a878 Binary files /dev/null and b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90ad differ diff --git a/test/integration/forcePushMultiple/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 diff --git a/test/integration/forcePushMultiple/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/forcePushMultiple/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/forcePushMultiple/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 new file mode 100644 index 000000000..e1d86f23c Binary files /dev/null and b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61 differ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 new file mode 100644 index 000000000..114e72ec5 Binary files /dev/null and b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5 differ diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..51eb490a4 --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..51eb490a4 --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..51eb490a4 --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch new file mode 100644 index 000000000..51eb490a4 --- /dev/null +++ b/test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch @@ -0,0 +1 @@ +e67f344f42afdb79c87a590f22537160241d8d61 diff --git a/test/integration/forcePushMultiple/expected/myfile1 b/test/integration/forcePushMultipleMatching/expected/repo/myfile1 similarity index 100% rename from test/integration/forcePushMultiple/expected/myfile1 rename to test/integration/forcePushMultipleMatching/expected/repo/myfile1 diff --git a/test/integration/forcePushMultiple/expected/myfile2 b/test/integration/forcePushMultipleMatching/expected/repo/myfile2 similarity index 100% rename from test/integration/forcePushMultiple/expected/myfile2 rename to test/integration/forcePushMultipleMatching/expected/repo/myfile2 diff --git a/test/integration/forcePushMultipleMatching/recording.json b/test/integration/forcePushMultipleMatching/recording.json new file mode 100644 index 000000000..ae367f16d --- /dev/null +++ b/test/integration/forcePushMultipleMatching/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":892,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1379,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2132,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":135,"Height":36}]} \ No newline at end of file diff --git a/test/integration/forcePushMultiple/setup.sh b/test/integration/forcePushMultipleMatching/setup.sh similarity index 90% rename from test/integration/forcePushMultiple/setup.sh rename to test/integration/forcePushMultipleMatching/setup.sh index 3c599991f..185ea46e9 100644 --- a/test/integration/forcePushMultiple/setup.sh +++ b/test/integration/forcePushMultipleMatching/setup.sh @@ -23,11 +23,11 @@ git checkout -b other_branch git checkout master cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master git branch --set-upstream-to=origin/other_branch other_branch diff --git a/test/integration/forcePushMultiple/test.json b/test/integration/forcePushMultipleMatching/test.json similarity index 65% rename from test/integration/forcePushMultiple/test.json rename to test/integration/forcePushMultipleMatching/test.json index f939494e9..e62caa40f 100644 --- a/test/integration/forcePushMultiple/test.json +++ b/test/integration/forcePushMultipleMatching/test.json @@ -1,4 +1,4 @@ { - "description": "Force push to multiple branches because the user hasn't configured git to do otherwise", + "description": "Force push to multiple branches because the user has push.default matching", "speed": 10 } diff --git a/test/integration/initialOpen/expected/.git_keep/HEAD b/test/integration/forcePushMultipleUpstream/expected/origin/HEAD similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/HEAD rename to test/integration/forcePushMultipleUpstream/expected/origin/HEAD diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/config b/test/integration/forcePushMultipleUpstream/expected/origin/config new file mode 100644 index 000000000..6504f87b4 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePushMultipleUpstream/actual/./repo diff --git a/test/integration/initialOpen/expected/.git_keep/description b/test/integration/forcePushMultipleUpstream/expected/origin/description similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/description rename to test/integration/forcePushMultipleUpstream/expected/origin/description diff --git a/test/integration/initialOpen/expected/.git_keep/info/exclude b/test/integration/forcePushMultipleUpstream/expected/origin/info/exclude similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/info/exclude rename to test/integration/forcePushMultipleUpstream/expected/origin/info/exclude diff --git a/test/integration/initialOpen/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pull/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 new file mode 100644 index 000000000..c1564b80f Binary files /dev/null and b/test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 differ diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936c b/test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936c new file mode 100644 index 000000000..52bacd105 Binary files /dev/null and b/test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936c differ diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 new file mode 100644 index 000000000..b9233622d --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 @@ -0,0 +1,3 @@ +xÍA +ƒ0@Ñ®sŠÙJ&Žc„R +®<ƘL¨à‘ÚÛ×#tûyðS5[ ñ¥ªà•SñÂË0jÌDŠ‘sÄ XZ¨ËLERœ¼Û«0ÍpŸæ§~ÄöMo©Ú)v4öàŠè½;ë9iú'wö-ë¦è~3—,Õ \ No newline at end of file diff --git a/test/integration/initialOpen/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pull/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 new file mode 100644 index 000000000..3054cb14b --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 @@ -0,0 +1,5 @@ +xÎM +ƒ0@á®sŠì %“óR +®<Æ8N¨`ªH +ííëº}|‹'[­K³éÒU+ê¥ 9v> rô2uÓ\8„0e•™C2;új–²2QAˆÙù”ÑIRt `ÌÄð»=·Ã£í‡ñ¡®ûª7ÙêÝB „”;òö +àœ9ë9ÕôOnê·,«’ù‚ 9— \ No newline at end of file diff --git a/test/integration/pullMerge/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/forcePushMultipleUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/packed-refs b/test/integration/forcePushMultipleUpstream/expected/origin/packed-refs new file mode 100644 index 000000000..06b105db2 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/origin/packed-refs @@ -0,0 +1,3 @@ +# pack-refs with: peeled fully-peeled sorted +49ea44f3ec1792142714930c8e4c3073f137936c refs/heads/master +49ea44f3ec1792142714930c8e4c3073f137936c refs/heads/other_branch diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master b/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master new file mode 100644 index 000000000..f29b96944 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master @@ -0,0 +1 @@ +49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch b/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch new file mode 100644 index 000000000..7c9ad8321 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch @@ -0,0 +1 @@ +c84375dda9d81c1f2103defe4384e31f859dac86 diff --git a/test/integration/pull/expected/.git_keep/COMMIT_EDITMSG b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pull/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e799afa43 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1,2 @@ +486301f318c84045827013a3c3246b8c6a319eb8 branch 'master' of ../origin +c84375dda9d81c1f2103defe4384e31f859dac86 not-for-merge branch 'other_branch' of ../origin diff --git a/test/integration/patchBuilding/expected/.git_keep/HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/HEAD rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/HEAD diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..7c9ad8321 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +c84375dda9d81c1f2103defe4384e31f859dac86 diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config new file mode 100644 index 000000000..3d6ea6c8d --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config @@ -0,0 +1,21 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[push] + default = upstream +[remote "origin"] + url = ../origin + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master +[branch "other_branch"] + remote = origin + merge = refs/heads/other_branch diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/description b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/description similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/description rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/description diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/index b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/index new file mode 100644 index 000000000..9ec36686f Binary files /dev/null and b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/index differ diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/info/exclude b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/info/exclude rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/info/exclude diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..e6ba4297a --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 81bdc116083cd4b4655333f4eb94dc0320197082 CI 1648349542 +1100 commit (initial): myfile1 +81bdc116083cd4b4655333f4eb94dc0320197082 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 commit: myfile2 +49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from master to other_branch +49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from other_branch to master +49ea44f3ec1792142714930c8e4c3073f137936c 486301f318c84045827013a3c3246b8c6a319eb8 CI 1648349542 +1100 commit: myfile3 +486301f318c84045827013a3c3246b8c6a319eb8 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ +49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from master to other_branch +49ea44f3ec1792142714930c8e4c3073f137936c c84375dda9d81c1f2103defe4384e31f859dac86 CI 1648349542 +1100 commit: myfile4 +c84375dda9d81c1f2103defe4384e31f859dac86 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ +49ea44f3ec1792142714930c8e4c3073f137936c 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 checkout: moving from other_branch to master diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..4e2739b8e --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 81bdc116083cd4b4655333f4eb94dc0320197082 CI 1648349542 +1100 commit (initial): myfile1 +81bdc116083cd4b4655333f4eb94dc0320197082 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 commit: myfile2 +49ea44f3ec1792142714930c8e4c3073f137936c 486301f318c84045827013a3c3246b8c6a319eb8 CI 1648349542 +1100 commit: myfile3 +486301f318c84045827013a3c3246b8c6a319eb8 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..efd57e6fd --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 branch: Created from HEAD +49ea44f3ec1792142714930c8e4c3073f137936c c84375dda9d81c1f2103defe4384e31f859dac86 CI 1648349542 +1100 commit: myfile4 +c84375dda9d81c1f2103defe4384e31f859dac86 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 reset: moving to HEAD^ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..c08c7c66b --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 fetch origin: storing head +49ea44f3ec1792142714930c8e4c3073f137936c 486301f318c84045827013a3c3246b8c6a319eb8 CI 1648349542 +1100 update by push +486301f318c84045827013a3c3246b8c6a319eb8 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349543 +1100 update by push diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch new file mode 100644 index 000000000..fd6564f9b --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 49ea44f3ec1792142714930c8e4c3073f137936c CI 1648349542 +1100 fetch origin: storing head +49ea44f3ec1792142714930c8e4c3073f137936c c84375dda9d81c1f2103defe4384e31f859dac86 CI 1648349542 +1100 update by push diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pull/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pull/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 new file mode 100644 index 000000000..c1564b80f Binary files /dev/null and b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8 differ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936c b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936c new file mode 100644 index 000000000..52bacd105 Binary files /dev/null and b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936c differ diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 new file mode 100644 index 000000000..b9233622d --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc0320197082 @@ -0,0 +1,3 @@ +xÍA +ƒ0@Ñ®sŠÙJ&Žc„R +®<ƘL¨à‘ÚÛ×#tûyðS5[ ñ¥ªà•SñÂË0jÌDŠ‘sÄ XZ¨ËLERœ¼Û«0ÍpŸæ§~ÄöMo©Ú)v4öàŠè½;ë9iú'wö-ë¦è~3—,Õ \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pull/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pull/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 new file mode 100644 index 000000000..3054cb14b --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac86 @@ -0,0 +1,5 @@ +xÎM +ƒ0@á®sŠì %“óR +®<Æ8N¨`ªH +ííëº}|‹'[­K³éÒU+ê¥ 9v> rô2uÓ\8„0e•™C2;új–²2QAˆÙù”ÑIRt `ÌÄð»=·Ã£í‡ñ¡®ûª7ÙêÝB „”;òö +àœ9ë9ÕôOnê·,«’ù‚ 9— \ No newline at end of file diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 new file mode 100644 index 000000000..5e9361d35 Binary files /dev/null and b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 differ diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..f29b96944 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..f29b96944 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..f29b96944 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +49ea44f3ec1792142714930c8e4c3073f137936c diff --git a/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch new file mode 100644 index 000000000..7c9ad8321 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch @@ -0,0 +1 @@ +c84375dda9d81c1f2103defe4384e31f859dac86 diff --git a/test/integration/initialOpen/expected/myfile1 b/test/integration/forcePushMultipleUpstream/expected/repo/myfile1 similarity index 100% rename from test/integration/initialOpen/expected/myfile1 rename to test/integration/forcePushMultipleUpstream/expected/repo/myfile1 diff --git a/test/integration/pull/expected/myfile2 b/test/integration/forcePushMultipleUpstream/expected/repo/myfile2 similarity index 100% rename from test/integration/pull/expected/myfile2 rename to test/integration/forcePushMultipleUpstream/expected/repo/myfile2 diff --git a/test/integration/forcePushMultipleUpstream/recording.json b/test/integration/forcePushMultipleUpstream/recording.json new file mode 100644 index 000000000..ae367f16d --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":892,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1379,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2132,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":135,"Height":36}]} \ No newline at end of file diff --git a/test/integration/forcePushMultipleUpstream/setup.sh b/test/integration/forcePushMultipleUpstream/setup.sh new file mode 100644 index 000000000..f31f24041 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/setup.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +set -e + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" +git config push.default upstream + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" + +git checkout -b other_branch +git checkout master + +cd .. +git clone --bare ./repo origin + +cd repo + +git remote add origin ../origin +git fetch origin +git branch --set-upstream-to=origin/master master +git branch --set-upstream-to=origin/other_branch other_branch + +echo test3 > myfile3 +git add . +git commit -am "myfile3" + +git push origin master +git reset --hard HEAD^ + +git checkout other_branch + +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +git push origin other_branch +git reset --hard HEAD^ + +git checkout master + +# at this point, both branches have diverged from their remote counterparts, meaning if you +# attempt to push either, it'll ask if you want to force push. diff --git a/test/integration/forcePushMultipleUpstream/test.json b/test/integration/forcePushMultipleUpstream/test.json new file mode 100644 index 000000000..4569d3cc9 --- /dev/null +++ b/test/integration/forcePushMultipleUpstream/test.json @@ -0,0 +1,4 @@ +{ + "description": "Force push to only one branch because the user has push.default upstream", + "speed": 10 +} diff --git a/test/integration/initialOpen/expected/.git_keep/COMMIT_EDITMSG b/test/integration/initialOpen/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/initialOpen/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/initialOpen/expected/.git_keep/FETCH_HEAD b/test/integration/initialOpen/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/FETCH_HEAD rename to test/integration/initialOpen/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/patchBuilding2/expected/.git_keep/HEAD b/test/integration/initialOpen/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/HEAD rename to test/integration/initialOpen/expected/repo/.git_keep/HEAD diff --git a/test/integration/initialOpen/expected/.git_keep/config b/test/integration/initialOpen/expected/repo/.git_keep/config similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/config rename to test/integration/initialOpen/expected/repo/.git_keep/config diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/description b/test/integration/initialOpen/expected/repo/.git_keep/description similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/description rename to test/integration/initialOpen/expected/repo/.git_keep/description diff --git a/test/integration/initialOpen/expected/.git_keep/index b/test/integration/initialOpen/expected/repo/.git_keep/index similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/index rename to test/integration/initialOpen/expected/repo/.git_keep/index diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/info/exclude b/test/integration/initialOpen/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/info/exclude rename to test/integration/initialOpen/expected/repo/.git_keep/info/exclude diff --git a/test/integration/initialOpen/expected/.git_keep/logs/HEAD b/test/integration/initialOpen/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/logs/HEAD rename to test/integration/initialOpen/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/initialOpen/expected/.git_keep/logs/refs/heads/master b/test/integration/initialOpen/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/logs/refs/heads/master rename to test/integration/initialOpen/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/initialOpen/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/initialOpen/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/initialOpen/expected/.git_keep/objects/46/f86259c48ec60496e43d9c962e32f40e7cdefb b/test/integration/initialOpen/expected/repo/.git_keep/objects/46/f86259c48ec60496e43d9c962e32f40e7cdefb similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/objects/46/f86259c48ec60496e43d9c962e32f40e7cdefb rename to test/integration/initialOpen/expected/repo/.git_keep/objects/46/f86259c48ec60496e43d9c962e32f40e7cdefb diff --git a/test/integration/initialOpen/expected/.git_keep/objects/62/b35f5751dd871e0908247223d276b5efeb4cb4 b/test/integration/initialOpen/expected/repo/.git_keep/objects/62/b35f5751dd871e0908247223d276b5efeb4cb4 similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/objects/62/b35f5751dd871e0908247223d276b5efeb4cb4 rename to test/integration/initialOpen/expected/repo/.git_keep/objects/62/b35f5751dd871e0908247223d276b5efeb4cb4 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/initialOpen/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/initialOpen/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/initialOpen/expected/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c b/test/integration/initialOpen/expected/repo/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c rename to test/integration/initialOpen/expected/repo/.git_keep/objects/e4/776798a2a73374b45e6321b60b5578b9fb590c diff --git a/test/integration/initialOpen/expected/.git_keep/refs/heads/master b/test/integration/initialOpen/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/initialOpen/expected/.git_keep/refs/heads/master rename to test/integration/initialOpen/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/patchBuilding/expected/myfile1 b/test/integration/initialOpen/expected/repo/myfile1 similarity index 100% rename from test/integration/patchBuilding/expected/myfile1 rename to test/integration/initialOpen/expected/repo/myfile1 diff --git a/test/integration/initialOpen/expected/myfile2 b/test/integration/initialOpen/expected/repo/myfile2 similarity index 100% rename from test/integration/initialOpen/expected/myfile2 rename to test/integration/initialOpen/expected/repo/myfile2 diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/FETCH_HEAD rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/HEAD rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/ORIG_HEAD rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/config b/test/integration/mergeConflictRevert/expected/repo/.git_keep/config similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/config rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/config diff --git a/test/integration/mergeConflicts/expected/.git_keep/description b/test/integration/mergeConflictRevert/expected/repo/.git_keep/description similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/description rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/description diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/index b/test/integration/mergeConflictRevert/expected/repo/.git_keep/index similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/index rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/index diff --git a/test/integration/mergeConflicts/expected/.git_keep/info/exclude b/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/info/exclude rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/logs/HEAD rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/logs/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/logs/refs/heads/another rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/logs/refs/heads/master rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/logs/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/logs/refs/heads/other rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/refs/heads/another rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/refs/heads/master rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/mergeConflictRevert/expected/.git_keep/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other similarity index 100% rename from test/integration/mergeConflictRevert/expected/.git_keep/refs/heads/other rename to test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other diff --git a/test/integration/mergeConflictRevert/expected/file1 b/test/integration/mergeConflictRevert/expected/repo/file1 similarity index 100% rename from test/integration/mergeConflictRevert/expected/file1 rename to test/integration/mergeConflictRevert/expected/repo/file1 diff --git a/test/integration/mergeConflictRevert/expected/file2 b/test/integration/mergeConflictRevert/expected/repo/file2 similarity index 100% rename from test/integration/mergeConflictRevert/expected/file2 rename to test/integration/mergeConflictRevert/expected/repo/file2 diff --git a/test/integration/mergeConflictRevert/expected/file4 b/test/integration/mergeConflictRevert/expected/repo/file4 similarity index 100% rename from test/integration/mergeConflictRevert/expected/file4 rename to test/integration/mergeConflictRevert/expected/repo/file4 diff --git a/test/integration/mergeConflictRevert/expected/file5 b/test/integration/mergeConflictRevert/expected/repo/file5 similarity index 100% rename from test/integration/mergeConflictRevert/expected/file5 rename to test/integration/mergeConflictRevert/expected/repo/file5 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/HEAD rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/MERGE_HEAD rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MODE b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MODE rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MSG b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/MERGE_MSG rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/config b/test/integration/mergeConflictUndo/expected/repo/.git_keep/config similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/config rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/config diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/description b/test/integration/mergeConflictUndo/expected/repo/.git_keep/description similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/description rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/description diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/index b/test/integration/mergeConflictUndo/expected/repo/.git_keep/index similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/index rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/index diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude b/test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/82/db6d0e4502f489719ea0f3dbe7e14413c6d28a b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/82/db6d0e4502f489719ea0f3dbe7e14413c6d28a similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/82/db6d0e4502f489719ea0f3dbe7e14413c6d28a rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/82/db6d0e4502f489719ea0f3dbe7e14413c6d28a diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/d762c119834784fdbf97e9bb3b4c15e804ebaa b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/8c/d762c119834784fdbf97e9bb3b4c15e804ebaa similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/d762c119834784fdbf97e9bb3b4c15e804ebaa rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/8c/d762c119834784fdbf97e9bb3b4c15e804ebaa diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch similarity index 100% rename from test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch rename to test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking1 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking1 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking1 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking1 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking2 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking2 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking2 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking2 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking3 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking3 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking3 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking3 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking4 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking4 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking4 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking4 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking5 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking5 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking5 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking5 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking6 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking6 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking6 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking6 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking7 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking7 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking7 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking7 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking8 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking8 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking8 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking8 diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking9 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking9 similarity index 100% rename from test/integration/mergeConflictUndo/expected/cherrypicking9 rename to test/integration/mergeConflictUndo/expected/repo/cherrypicking9 diff --git a/test/integration/mergeConflictUndo/expected/directory/file b/test/integration/mergeConflictUndo/expected/repo/directory/file similarity index 100% rename from test/integration/mergeConflictUndo/expected/directory/file rename to test/integration/mergeConflictUndo/expected/repo/directory/file diff --git a/test/integration/mergeConflictUndo/expected/directory/file2 b/test/integration/mergeConflictUndo/expected/repo/directory/file2 similarity index 100% rename from test/integration/mergeConflictUndo/expected/directory/file2 rename to test/integration/mergeConflictUndo/expected/repo/directory/file2 diff --git a/test/integration/mergeConflictUndo/expected/file b/test/integration/mergeConflictUndo/expected/repo/file similarity index 100% rename from test/integration/mergeConflictUndo/expected/file rename to test/integration/mergeConflictUndo/expected/repo/file diff --git a/test/integration/mergeConflictUndo/expected/file1 b/test/integration/mergeConflictUndo/expected/repo/file1 similarity index 100% rename from test/integration/mergeConflictUndo/expected/file1 rename to test/integration/mergeConflictUndo/expected/repo/file1 diff --git a/test/integration/mergeConflictUndo/expected/file3 b/test/integration/mergeConflictUndo/expected/repo/file3 similarity index 100% rename from test/integration/mergeConflictUndo/expected/file3 rename to test/integration/mergeConflictUndo/expected/repo/file3 diff --git a/test/integration/mergeConflictUndo/expected/file4 b/test/integration/mergeConflictUndo/expected/repo/file4 similarity index 100% rename from test/integration/mergeConflictUndo/expected/file4 rename to test/integration/mergeConflictUndo/expected/repo/file4 diff --git a/test/integration/mergeConflictUndo/expected/file5 b/test/integration/mergeConflictUndo/expected/repo/file5 similarity index 100% rename from test/integration/mergeConflictUndo/expected/file5 rename to test/integration/mergeConflictUndo/expected/repo/file5 diff --git a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/mergeConflicts/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/FETCH_HEAD rename to test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/mergeConflicts/expected/.git_keep/HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/HEAD rename to test/integration/mergeConflicts/expected/repo/.git_keep/HEAD diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD rename to test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/mergeConflicts/expected/.git_keep/config b/test/integration/mergeConflicts/expected/repo/.git_keep/config similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/config rename to test/integration/mergeConflicts/expected/repo/.git_keep/config diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/description b/test/integration/mergeConflicts/expected/repo/.git_keep/description similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/description rename to test/integration/mergeConflicts/expected/repo/.git_keep/description diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/repo/.git_keep/index similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/index rename to test/integration/mergeConflicts/expected/repo/.git_keep/index diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/info/exclude b/test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/info/exclude rename to test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/logs/HEAD rename to test/integration/mergeConflicts/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch rename to test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop rename to test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking rename to test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master rename to test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch rename to test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ed/d4e2e50eb82125428b045c540a9194d934e180 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/ed/d4e2e50eb82125428b045c540a9194d934e180 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/ed/d4e2e50eb82125428b045c540a9194d934e180 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/ed/d4e2e50eb82125428b045c540a9194d934e180 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflicts/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 rename to test/integration/mergeConflicts/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch rename to test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop rename to test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking rename to test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/refs/heads/master rename to test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch similarity index 100% rename from test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch rename to test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch diff --git a/test/integration/mergeConflicts/expected/cherrypicking1 b/test/integration/mergeConflicts/expected/repo/cherrypicking1 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking1 rename to test/integration/mergeConflicts/expected/repo/cherrypicking1 diff --git a/test/integration/mergeConflicts/expected/cherrypicking2 b/test/integration/mergeConflicts/expected/repo/cherrypicking2 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking2 rename to test/integration/mergeConflicts/expected/repo/cherrypicking2 diff --git a/test/integration/mergeConflicts/expected/cherrypicking3 b/test/integration/mergeConflicts/expected/repo/cherrypicking3 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking3 rename to test/integration/mergeConflicts/expected/repo/cherrypicking3 diff --git a/test/integration/mergeConflicts/expected/cherrypicking4 b/test/integration/mergeConflicts/expected/repo/cherrypicking4 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking4 rename to test/integration/mergeConflicts/expected/repo/cherrypicking4 diff --git a/test/integration/mergeConflicts/expected/cherrypicking5 b/test/integration/mergeConflicts/expected/repo/cherrypicking5 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking5 rename to test/integration/mergeConflicts/expected/repo/cherrypicking5 diff --git a/test/integration/mergeConflicts/expected/cherrypicking6 b/test/integration/mergeConflicts/expected/repo/cherrypicking6 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking6 rename to test/integration/mergeConflicts/expected/repo/cherrypicking6 diff --git a/test/integration/mergeConflicts/expected/cherrypicking7 b/test/integration/mergeConflicts/expected/repo/cherrypicking7 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking7 rename to test/integration/mergeConflicts/expected/repo/cherrypicking7 diff --git a/test/integration/mergeConflicts/expected/cherrypicking8 b/test/integration/mergeConflicts/expected/repo/cherrypicking8 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking8 rename to test/integration/mergeConflicts/expected/repo/cherrypicking8 diff --git a/test/integration/mergeConflicts/expected/cherrypicking9 b/test/integration/mergeConflicts/expected/repo/cherrypicking9 similarity index 100% rename from test/integration/mergeConflicts/expected/cherrypicking9 rename to test/integration/mergeConflicts/expected/repo/cherrypicking9 diff --git a/test/integration/mergeConflicts/expected/directory/file b/test/integration/mergeConflicts/expected/repo/directory/file similarity index 100% rename from test/integration/mergeConflicts/expected/directory/file rename to test/integration/mergeConflicts/expected/repo/directory/file diff --git a/test/integration/mergeConflicts/expected/directory/file2 b/test/integration/mergeConflicts/expected/repo/directory/file2 similarity index 100% rename from test/integration/mergeConflicts/expected/directory/file2 rename to test/integration/mergeConflicts/expected/repo/directory/file2 diff --git a/test/integration/mergeConflicts/expected/file b/test/integration/mergeConflicts/expected/repo/file similarity index 100% rename from test/integration/mergeConflicts/expected/file rename to test/integration/mergeConflicts/expected/repo/file diff --git a/test/integration/mergeConflicts/expected/file1 b/test/integration/mergeConflicts/expected/repo/file1 similarity index 100% rename from test/integration/mergeConflicts/expected/file1 rename to test/integration/mergeConflicts/expected/repo/file1 diff --git a/test/integration/mergeConflicts/expected/file3 b/test/integration/mergeConflicts/expected/repo/file3 similarity index 100% rename from test/integration/mergeConflicts/expected/file3 rename to test/integration/mergeConflicts/expected/repo/file3 diff --git a/test/integration/mergeConflicts/expected/file4 b/test/integration/mergeConflicts/expected/repo/file4 similarity index 100% rename from test/integration/mergeConflicts/expected/file4 rename to test/integration/mergeConflicts/expected/repo/file4 diff --git a/test/integration/mergeConflicts/expected/file5 b/test/integration/mergeConflicts/expected/repo/file5 similarity index 100% rename from test/integration/mergeConflicts/expected/file5 rename to test/integration/mergeConflicts/expected/repo/file5 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/FETCH_HEAD rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/HEAD diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/config b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/config similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/config rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/config diff --git a/test/integration/patchBuilding/expected/.git_keep/description b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/description similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/description rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/description diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/index b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/index similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/index rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/index diff --git a/test/integration/patchBuilding/expected/.git_keep/info/exclude b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/info/exclude rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/info/exclude diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/develop similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/develop diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5e/66799d4a5a3fed89757f3df445a962c9ce2d4f b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/5e/66799d4a5a3fed89757f3df445a962c9ce2d4f similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5e/66799d4a5a3fed89757f3df445a962c9ce2d4f rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/5e/66799d4a5a3fed89757f3df445a962c9ce2d4f diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/8617710499a59992caf98d6df1b5f981c58ab1 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d8/8617710499a59992caf98d6df1b5f981c58ab1 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/8617710499a59992caf98d6df1b5f981c58ab1 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d8/8617710499a59992caf98d6df1b5f981c58ab1 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dd/401e3ee3d58b648207cee7f737364a37139bea b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/dd/401e3ee3d58b648207cee7f737364a37139bea similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dd/401e3ee3d58b648207cee7f737364a37139bea rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/dd/401e3ee3d58b648207cee7f737364a37139bea diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/base_branch similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/base_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/develop similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/develop diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/feature/cherry-picking similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/feature/cherry-picking diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/other_branch similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch rename to test/integration/mergeConflictsFiltered/expected/repo/.git_keep/refs/heads/other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking1 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking1 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking1 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking1 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking2 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking2 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking2 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking2 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking3 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking3 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking3 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking3 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking4 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking4 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking4 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking4 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking5 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking5 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking5 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking5 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking6 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking6 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking6 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking6 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking7 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking7 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking7 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking7 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking8 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking8 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking8 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking8 diff --git a/test/integration/mergeConflictsFiltered/expected/cherrypicking9 b/test/integration/mergeConflictsFiltered/expected/repo/cherrypicking9 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/cherrypicking9 rename to test/integration/mergeConflictsFiltered/expected/repo/cherrypicking9 diff --git a/test/integration/mergeConflictsFiltered/expected/directory/file b/test/integration/mergeConflictsFiltered/expected/repo/directory/file similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/directory/file rename to test/integration/mergeConflictsFiltered/expected/repo/directory/file diff --git a/test/integration/mergeConflictsFiltered/expected/directory/file2 b/test/integration/mergeConflictsFiltered/expected/repo/directory/file2 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/directory/file2 rename to test/integration/mergeConflictsFiltered/expected/repo/directory/file2 diff --git a/test/integration/mergeConflictsFiltered/expected/file b/test/integration/mergeConflictsFiltered/expected/repo/file similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/file rename to test/integration/mergeConflictsFiltered/expected/repo/file diff --git a/test/integration/mergeConflictsFiltered/expected/file1 b/test/integration/mergeConflictsFiltered/expected/repo/file1 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/file1 rename to test/integration/mergeConflictsFiltered/expected/repo/file1 diff --git a/test/integration/mergeConflictsFiltered/expected/file3 b/test/integration/mergeConflictsFiltered/expected/repo/file3 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/file3 rename to test/integration/mergeConflictsFiltered/expected/repo/file3 diff --git a/test/integration/mergeConflictsFiltered/expected/file4 b/test/integration/mergeConflictsFiltered/expected/repo/file4 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/file4 rename to test/integration/mergeConflictsFiltered/expected/repo/file4 diff --git a/test/integration/mergeConflictsFiltered/expected/file5 b/test/integration/mergeConflictsFiltered/expected/repo/file5 similarity index 100% rename from test/integration/mergeConflictsFiltered/expected/file5 rename to test/integration/mergeConflictsFiltered/expected/repo/file5 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/FETCH_HEAD rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/HEAD rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/HEAD diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/config b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/config similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/config rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/config diff --git a/test/integration/patchBuilding2/expected/.git_keep/description b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/description similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/description rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/description diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/index b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/index similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/index rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/index diff --git a/test/integration/patchBuilding2/expected/.git_keep/info/exclude b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/info/exclude rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/info/exclude diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/HEAD rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/master rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/other b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/other similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/other rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/logs/refs/heads/other diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/master rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/other b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/other similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/other rename to test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/refs/heads/other diff --git a/test/integration/mergeConflictsResolvedExternally/expected/file b/test/integration/mergeConflictsResolvedExternally/expected/repo/file similarity index 100% rename from test/integration/mergeConflictsResolvedExternally/expected/file rename to test/integration/mergeConflictsResolvedExternally/expected/repo/file diff --git a/test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuilding/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/patchBuilding/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/patchBuilding/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuilding/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/FETCH_HEAD rename to test/integration/patchBuilding/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/HEAD b/test/integration/patchBuilding/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/HEAD rename to test/integration/patchBuilding/expected/repo/.git_keep/HEAD diff --git a/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD rename to test/integration/patchBuilding/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/patchBuilding/expected/.git_keep/config b/test/integration/patchBuilding/expected/repo/.git_keep/config similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/config rename to test/integration/patchBuilding/expected/repo/.git_keep/config diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/description b/test/integration/patchBuilding/expected/repo/.git_keep/description similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/description rename to test/integration/patchBuilding/expected/repo/.git_keep/description diff --git a/test/integration/patchBuilding/expected/.git_keep/index b/test/integration/patchBuilding/expected/repo/.git_keep/index similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/index rename to test/integration/patchBuilding/expected/repo/.git_keep/index diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/info/exclude b/test/integration/patchBuilding/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/info/exclude rename to test/integration/patchBuilding/expected/repo/.git_keep/info/exclude diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/logs/HEAD rename to test/integration/patchBuilding/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master rename to test/integration/patchBuilding/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 diff --git a/test/integration/pull/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa b/test/integration/patchBuilding/expected/repo/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/patchBuilding/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 b/test/integration/patchBuilding/expected/repo/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a b/test/integration/patchBuilding/expected/repo/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a rename to test/integration/patchBuilding/expected/repo/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a diff --git a/test/integration/patchBuilding/expected/.git_keep/refs/heads/master b/test/integration/patchBuilding/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/patchBuilding/expected/.git_keep/refs/heads/master rename to test/integration/patchBuilding/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/patchBuilding2/expected/myfile1 b/test/integration/patchBuilding/expected/repo/myfile1 similarity index 100% rename from test/integration/patchBuilding2/expected/myfile1 rename to test/integration/patchBuilding/expected/repo/myfile1 diff --git a/test/integration/patchBuilding/expected/myfile2 b/test/integration/patchBuilding/expected/repo/myfile2 similarity index 100% rename from test/integration/patchBuilding/expected/myfile2 rename to test/integration/patchBuilding/expected/repo/myfile2 diff --git a/test/integration/patchBuilding/expected/myfile3 b/test/integration/patchBuilding/expected/repo/myfile3 similarity index 100% rename from test/integration/patchBuilding/expected/myfile3 rename to test/integration/patchBuilding/expected/repo/myfile3 diff --git a/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuilding2/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/patchBuilding2/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/patchBuilding2/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuilding2/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/FETCH_HEAD rename to test/integration/patchBuilding2/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/HEAD b/test/integration/patchBuilding2/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/HEAD rename to test/integration/patchBuilding2/expected/repo/.git_keep/HEAD diff --git a/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding2/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD rename to test/integration/patchBuilding2/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/patchBuilding2/expected/.git_keep/config b/test/integration/patchBuilding2/expected/repo/.git_keep/config similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/config rename to test/integration/patchBuilding2/expected/repo/.git_keep/config diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/description b/test/integration/patchBuilding2/expected/repo/.git_keep/description similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/description rename to test/integration/patchBuilding2/expected/repo/.git_keep/description diff --git a/test/integration/patchBuilding2/expected/.git_keep/index b/test/integration/patchBuilding2/expected/repo/.git_keep/index similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/index rename to test/integration/patchBuilding2/expected/repo/.git_keep/index diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/info/exclude b/test/integration/patchBuilding2/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/info/exclude rename to test/integration/patchBuilding2/expected/repo/.git_keep/info/exclude diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding2/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/logs/HEAD rename to test/integration/patchBuilding2/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding2/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master rename to test/integration/patchBuilding2/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash b/test/integration/patchBuilding2/expected/repo/.git_keep/logs/refs/stash similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash rename to test/integration/patchBuilding2/expected/repo/.git_keep/logs/refs/stash diff --git a/test/integration/pull/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pull/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/d3/4fc4a9c0c675a5cb11d848e5afef4c89160dc0 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/d3/4fc4a9c0c675a5cb11d848e5afef4c89160dc0 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/d3/4fc4a9c0c675a5cb11d848e5afef4c89160dc0 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/d3/4fc4a9c0c675a5cb11d848e5afef4c89160dc0 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a b/test/integration/patchBuilding2/expected/repo/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a rename to test/integration/patchBuilding2/expected/repo/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a diff --git a/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master b/test/integration/patchBuilding2/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/refs/heads/master rename to test/integration/patchBuilding2/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/patchBuilding2/expected/.git_keep/refs/stash b/test/integration/patchBuilding2/expected/repo/.git_keep/refs/stash similarity index 100% rename from test/integration/patchBuilding2/expected/.git_keep/refs/stash rename to test/integration/patchBuilding2/expected/repo/.git_keep/refs/stash diff --git a/test/integration/pull/expected/myfile1 b/test/integration/patchBuilding2/expected/repo/myfile1 similarity index 100% rename from test/integration/pull/expected/myfile1 rename to test/integration/patchBuilding2/expected/repo/myfile1 diff --git a/test/integration/patchBuilding2/expected/myfile2 b/test/integration/patchBuilding2/expected/repo/myfile2 similarity index 100% rename from test/integration/patchBuilding2/expected/myfile2 rename to test/integration/patchBuilding2/expected/repo/myfile2 diff --git a/test/integration/patchBuilding2/expected/myfile3 b/test/integration/patchBuilding2/expected/repo/myfile3 similarity index 100% rename from test/integration/patchBuilding2/expected/myfile3 rename to test/integration/patchBuilding2/expected/repo/myfile3 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/FETCH_HEAD rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/pull/expected/.git_keep/HEAD b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pull/expected/.git_keep/HEAD rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/HEAD diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/config b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/config similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/config rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/config diff --git a/test/integration/pull/expected/.git_keep/description b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pull/expected/.git_keep/description rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/description diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/index b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/index similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/index rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/index diff --git a/test/integration/pull/expected/.git_keep/info/exclude b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pull/expected/.git_keep/info/exclude rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/info/exclude diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/logs/HEAD b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/logs/HEAD rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/logs/refs/heads/master rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/pull/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/70/28eaec19b2723b62690974057c92ba7d8c1b11 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/70/28eaec19b2723b62690974057c92ba7d8c1b11 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/70/28eaec19b2723b62690974057c92ba7d8c1b11 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/70/28eaec19b2723b62690974057c92ba7d8c1b11 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 diff --git a/test/integration/pull/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/objects/cf/149a94a18c990b2c5cdd0cf15ec4880f51c8b0 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/cf/149a94a18c990b2c5cdd0cf15ec4880f51c8b0 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/objects/cf/149a94a18c990b2c5cdd0cf15ec4880f51c8b0 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/cf/149a94a18c990b2c5cdd0cf15ec4880f51c8b0 diff --git a/test/integration/pull/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pull/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/patchBuildingToggleAll/expected/.git_keep/refs/heads/master b/test/integration/patchBuildingToggleAll/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/.git_keep/refs/heads/master rename to test/integration/patchBuildingToggleAll/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/patchBuildingToggleAll/expected/one/two/three/file3 b/test/integration/patchBuildingToggleAll/expected/repo/one/two/three/file3 similarity index 100% rename from test/integration/patchBuildingToggleAll/expected/one/two/three/file3 rename to test/integration/patchBuildingToggleAll/expected/repo/one/two/three/file3 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/FETCH_HEAD rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/pull/expected_remote/HEAD b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pull/expected_remote/HEAD rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/HEAD diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/config b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/config similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/config rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/config diff --git a/test/integration/pull/expected_remote/description b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pull/expected_remote/description rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/description diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/index b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/index similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/index rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/index diff --git a/test/integration/pull/expected_remote/info/exclude b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pull/expected_remote/info/exclude rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/info/exclude diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/pull/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pull/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/41/05b6da4ccc191a4abd24b1ffac6a2031534c0b diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/43/9a6f2a3c627cd37ba1c5eda6a49c26a85ad610 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/43/9a6f2a3c627cd37ba1c5eda6a49c26a85ad610 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/43/9a6f2a3c627cd37ba1c5eda6a49c26a85ad610 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/43/9a6f2a3c627cd37ba1c5eda6a49c26a85ad610 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/44/eb4bd0e7419049a8e4176945786c20dae60d7c diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/57a1e78421c0c1bf9eb3bcc89f6c0996b9f89e b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/54/57a1e78421c0c1bf9eb3bcc89f6c0996b9f89e similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/54/57a1e78421c0c1bf9eb3bcc89f6c0996b9f89e rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/54/57a1e78421c0c1bf9eb3bcc89f6c0996b9f89e diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/5a/abb4aaf3d6cc113fec7f7a3c0a880988085c23 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/5a/abb4aaf3d6cc113fec7f7a3c0a880988085c23 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/5a/abb4aaf3d6cc113fec7f7a3c0a880988085c23 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/5a/abb4aaf3d6cc113fec7f7a3c0a880988085c23 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/68/bbd52379d849022495dcfd11b13f2fb3103d37 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/98/1651deb012f8e684dd306c1f5bf8edd5c3db67 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/9f/aac09750995930a5d55eccf91ad6f802e8c66b b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/9f/aac09750995930a5d55eccf91ad6f802e8c66b similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/9f/aac09750995930a5d55eccf91ad6f802e8c66b rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/9f/aac09750995930a5d55eccf91ad6f802e8c66b diff --git a/test/integration/pull/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pull/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 diff --git a/test/integration/pull/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pull/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pull/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pull/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master b/test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master rename to test/integration/patchBuildingWithFiletree/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/patchBuildingWithFiletree/expected/one/two/file2 b/test/integration/patchBuildingWithFiletree/expected/repo/one/two/file2 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/one/two/file2 rename to test/integration/patchBuildingWithFiletree/expected/repo/one/two/file2 diff --git a/test/integration/patchBuildingWithFiletree/expected/one/two/three/file3 b/test/integration/patchBuildingWithFiletree/expected/repo/one/two/three/file3 similarity index 100% rename from test/integration/patchBuildingWithFiletree/expected/one/two/three/file3 rename to test/integration/patchBuildingWithFiletree/expected/repo/one/two/three/file3 diff --git a/test/integration/pull/expected/.git_keep/FETCH_HEAD b/test/integration/pull/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index d13b7c7d7..000000000 --- a/test/integration/pull/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -6ad6c42187d356f4eab4f004cca17863746adec1 branch 'master' of ../actual_remote diff --git a/test/integration/pull/expected/.git_keep/ORIG_HEAD b/test/integration/pull/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 22c16cf39..000000000 --- a/test/integration/pull/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -0c0f210a4e5ff3b58e4190501c2b755695f439fa diff --git a/test/integration/pull/expected/.git_keep/index b/test/integration/pull/expected/.git_keep/index deleted file mode 100644 index 97b142556..000000000 Binary files a/test/integration/pull/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pull/expected/.git_keep/logs/HEAD b/test/integration/pull/expected/.git_keep/logs/HEAD deleted file mode 100644 index f15401d8d..000000000 --- a/test/integration/pull/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 003527daa0801470151d8f93140a02fc306fea00 CI 1634896904 +1100 commit (initial): myfile1 -003527daa0801470151d8f93140a02fc306fea00 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 commit: myfile2 -0c0f210a4e5ff3b58e4190501c2b755695f439fa 336826e035e431ac94eca7f3cb6dd3fb072f7a5a CI 1634896904 +1100 commit: myfile3 -336826e035e431ac94eca7f3cb6dd3fb072f7a5a 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896904 +1100 commit: myfile4 -6ad6c42187d356f4eab4f004cca17863746adec1 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 reset: moving to head^^ -0c0f210a4e5ff3b58e4190501c2b755695f439fa 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896905 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/pull/expected/.git_keep/logs/refs/heads/master b/test/integration/pull/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index f15401d8d..000000000 --- a/test/integration/pull/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 003527daa0801470151d8f93140a02fc306fea00 CI 1634896904 +1100 commit (initial): myfile1 -003527daa0801470151d8f93140a02fc306fea00 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 commit: myfile2 -0c0f210a4e5ff3b58e4190501c2b755695f439fa 336826e035e431ac94eca7f3cb6dd3fb072f7a5a CI 1634896904 +1100 commit: myfile3 -336826e035e431ac94eca7f3cb6dd3fb072f7a5a 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896904 +1100 commit: myfile4 -6ad6c42187d356f4eab4f004cca17863746adec1 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 reset: moving to head^^ -0c0f210a4e5ff3b58e4190501c2b755695f439fa 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896905 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index b254fcd0d..000000000 --- a/test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896904 +1100 fetch origin: storing head diff --git a/test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea00 b/test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea00 deleted file mode 100644 index 0ed3c76d8..000000000 --- a/test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea00 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙÊŒNÇJ\yŒ˜L¨à")´·×#tûyðS5[Ë¥íª€*©`”eê3³’—ì©‹T^¸ÏÂ%¦{ç⧽êÓ iõí½é-U{IÏ>H@†+¢;ë9iú'wö+ë¦ä4í,Ý \ No newline at end of file diff --git a/test/integration/pull/expected/.git_keep/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa b/test/integration/pull/expected/.git_keep/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa deleted file mode 100644 index a89fa981c..000000000 Binary files a/test/integration/pull/expected/.git_keep/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa and /dev/null differ diff --git a/test/integration/pull/expected/.git_keep/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a b/test/integration/pull/expected/.git_keep/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a deleted file mode 100644 index 2b7ab37ad..000000000 Binary files a/test/integration/pull/expected/.git_keep/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a and /dev/null differ diff --git a/test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 b/test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 deleted file mode 100644 index 335077711..000000000 --- a/test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚d2“I"BW=Æ4`ÁØR"èííÜ~Þâ—µµ¥[Èt껪õ•!’ “#LhækdOŠ„ f“]_Ý"rò¬ƒ‚”LZ$V,Ï3ÖÉE_£1òîu·Ãh¯Ãx×´í©—²¶›FJ™³#{pÎõ˜êú'7í[—§’ùôâ90 \ No newline at end of file diff --git a/test/integration/pull/expected/.git_keep/refs/heads/master b/test/integration/pull/expected/.git_keep/refs/heads/master deleted file mode 100644 index 120f0043b..000000000 --- a/test/integration/pull/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -6ad6c42187d356f4eab4f004cca17863746adec1 diff --git a/test/integration/pull/expected/.git_keep/refs/remotes/origin/master b/test/integration/pull/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 120f0043b..000000000 --- a/test/integration/pull/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -6ad6c42187d356f4eab4f004cca17863746adec1 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/HEAD b/test/integration/pull/expected/origin/HEAD similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/HEAD rename to test/integration/pull/expected/origin/HEAD diff --git a/test/integration/push/expected_remote/config b/test/integration/pull/expected/origin/config similarity index 80% rename from test/integration/push/expected_remote/config rename to test/integration/pull/expected/origin/config index 26275994b..e92bfb417 100644 --- a/test/integration/push/expected_remote/config +++ b/test/integration/pull/expected/origin/config @@ -5,4 +5,4 @@ ignorecase = true precomposeunicode = true [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/push/./actual + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pull/actual/./repo diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/description b/test/integration/pull/expected/origin/description similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/description rename to test/integration/pull/expected/origin/description diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/info/exclude b/test/integration/pull/expected/origin/info/exclude similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/info/exclude rename to test/integration/pull/expected/origin/info/exclude diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pull/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pull/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pull/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pull/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pull/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pull/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pull/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pull/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pull/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pull/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pull/expected/origin/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 b/test/integration/pull/expected/origin/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 new file mode 100644 index 000000000..a56e97735 --- /dev/null +++ b/test/integration/pull/expected/origin/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJÆŒãJ\yŒ˜L¨à")´·×#tûyðS5[ ñ¥íªà•Sñ‘—á®’‰…³`± ´PÈL%¦¾sñÓ^u‡i†Ç4úöÞô–ª=™$pàŠè½;ë9iú'wö+ë¦è49,Ù \ No newline at end of file diff --git a/test/integration/pull/expected/origin/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 b/test/integration/pull/expected/origin/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 new file mode 100644 index 000000000..a03a86b26 Binary files /dev/null and b/test/integration/pull/expected/origin/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 differ diff --git a/test/integration/pull/expected/origin/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 b/test/integration/pull/expected/origin/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 new file mode 100644 index 000000000..6921642c3 Binary files /dev/null and b/test/integration/pull/expected/origin/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 differ diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pull/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pull/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pull/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pull/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pull/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pull/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pull/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pull/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pull/expected/origin/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 b/test/integration/pull/expected/origin/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 new file mode 100644 index 000000000..0277b216d --- /dev/null +++ b/test/integration/pull/expected/origin/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 @@ -0,0 +1,3 @@ +xŽA +à E»öî Åq4*”RÈ*ÇÐq†j‚…ööõ]}x¼Ÿ¶ÖÖ®!¹S?˜µ-âU¢d‡"¹J4 ‚%?–XíùàWס¤œ@SÉÆJõ¾AÁ` œc + “ÊïþØ=/ú:/wþä¶?ùB[»i˜\D'ú `Œtœêü§®ÚWÖ'£ú‘};¦ \ No newline at end of file diff --git a/test/integration/pull/expected/origin/packed-refs b/test/integration/pull/expected/origin/packed-refs new file mode 100644 index 000000000..b9e906164 --- /dev/null +++ b/test/integration/pull/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +97bf06c598032ab5ad0faf744c91545071f3cb38 refs/heads/master diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pull/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pull/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pull/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pull/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..872d125b1 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +97bf06c598032ab5ad0faf744c91545071f3cb38 branch 'master' of ../origin diff --git a/test/integration/pullAndSetUpstream/expected_remote/HEAD b/test/integration/pull/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/HEAD rename to test/integration/pull/expected/repo/.git_keep/HEAD diff --git a/test/integration/pull/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pull/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..480b52b43 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +7b9a91f4ecba02fd55dbf3f372bc3faee3897939 diff --git a/test/integration/push/expected/.git_keep/config b/test/integration/pull/expected/repo/.git_keep/config similarity index 92% rename from test/integration/push/expected/.git_keep/config rename to test/integration/pull/expected/repo/.git_keep/config index 821803a3e..7721ae814 100644 --- a/test/integration/push/expected/.git_keep/config +++ b/test/integration/pull/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pullAndSetUpstream/expected_remote/description b/test/integration/pull/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/description rename to test/integration/pull/expected/repo/.git_keep/description diff --git a/test/integration/pull/expected/repo/.git_keep/index b/test/integration/pull/expected/repo/.git_keep/index new file mode 100644 index 000000000..b5f0f25a7 Binary files /dev/null and b/test/integration/pull/expected/repo/.git_keep/index differ diff --git a/test/integration/pullAndSetUpstream/expected_remote/info/exclude b/test/integration/pull/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/info/exclude rename to test/integration/pull/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pull/expected/repo/.git_keep/logs/HEAD b/test/integration/pull/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..f67583b72 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 3ea0c134bed03d0a2cb7eeaff586af277d137129 CI 1648348653 +1100 commit (initial): myfile1 +3ea0c134bed03d0a2cb7eeaff586af277d137129 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 commit: myfile2 +7b9a91f4ecba02fd55dbf3f372bc3faee3897939 f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 CI 1648348653 +1100 commit: myfile3 +f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348653 +1100 commit: myfile4 +97bf06c598032ab5ad0faf744c91545071f3cb38 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 reset: moving to HEAD~2 +7b9a91f4ecba02fd55dbf3f372bc3faee3897939 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348654 +1100 rebase -i (start): checkout 97bf06c598032ab5ad0faf744c91545071f3cb38 +97bf06c598032ab5ad0faf744c91545071f3cb38 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348654 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pull/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pull/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..bbbd7e2e5 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 3ea0c134bed03d0a2cb7eeaff586af277d137129 CI 1648348653 +1100 commit (initial): myfile1 +3ea0c134bed03d0a2cb7eeaff586af277d137129 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 commit: myfile2 +7b9a91f4ecba02fd55dbf3f372bc3faee3897939 f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 CI 1648348653 +1100 commit: myfile3 +f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348653 +1100 commit: myfile4 +97bf06c598032ab5ad0faf744c91545071f3cb38 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 reset: moving to HEAD~2 +7b9a91f4ecba02fd55dbf3f372bc3faee3897939 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348654 +1100 rebase -i (finish): refs/heads/master onto 97bf06c598032ab5ad0faf744c91545071f3cb38 diff --git a/test/integration/pull/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pull/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..69650cb95 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348653 +1100 fetch origin: storing head diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pull/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pull/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pull/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pull/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pull/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pull/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pull/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pull/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pull/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pull/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pull/expected/repo/.git_keep/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 b/test/integration/pull/expected/repo/.git_keep/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 new file mode 100644 index 000000000..a56e97735 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJÆŒãJ\yŒ˜L¨à")´·×#tûyðS5[ ñ¥íªà•Sñ‘—á®’‰…³`± ´PÈL%¦¾sñÓ^u‡i†Ç4úöÞô–ª=™$pàŠè½;ë9iú'wö+ë¦è49,Ù \ No newline at end of file diff --git a/test/integration/pull/expected/repo/.git_keep/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 b/test/integration/pull/expected/repo/.git_keep/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 new file mode 100644 index 000000000..a03a86b26 Binary files /dev/null and b/test/integration/pull/expected/repo/.git_keep/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 b/test/integration/pull/expected/repo/.git_keep/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 new file mode 100644 index 000000000..6921642c3 Binary files /dev/null and b/test/integration/pull/expected/repo/.git_keep/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 differ diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pull/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pull/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pull/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pull/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pull/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pull/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pull/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pull/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pull/expected/repo/.git_keep/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 b/test/integration/pull/expected/repo/.git_keep/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 new file mode 100644 index 000000000..0277b216d --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 @@ -0,0 +1,3 @@ +xŽA +à E»öî Åq4*”RÈ*ÇÐq†j‚…ööõ]}x¼Ÿ¶ÖÖ®!¹S?˜µ-âU¢d‡"¹J4 ‚%?–XíùàWס¤œ@SÉÆJõ¾AÁ` œc + “ÊïþØ=/ú:/wþä¶?ùB[»i˜\D'ú `Œtœêü§®ÚWÖ'£ú‘};¦ \ No newline at end of file diff --git a/test/integration/pull/expected/repo/.git_keep/refs/heads/master b/test/integration/pull/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..49859b120 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +97bf06c598032ab5ad0faf744c91545071f3cb38 diff --git a/test/integration/pull/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pull/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..49859b120 --- /dev/null +++ b/test/integration/pull/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +97bf06c598032ab5ad0faf744c91545071f3cb38 diff --git a/test/integration/pullAndSetUpstream/expected/myfile1 b/test/integration/pull/expected/repo/myfile1 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/myfile1 rename to test/integration/pull/expected/repo/myfile1 diff --git a/test/integration/pullAndSetUpstream/expected/myfile2 b/test/integration/pull/expected/repo/myfile2 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/myfile2 rename to test/integration/pull/expected/repo/myfile2 diff --git a/test/integration/pull/expected/myfile3 b/test/integration/pull/expected/repo/myfile3 similarity index 100% rename from test/integration/pull/expected/myfile3 rename to test/integration/pull/expected/repo/myfile3 diff --git a/test/integration/pull/expected/myfile4 b/test/integration/pull/expected/repo/myfile4 similarity index 100% rename from test/integration/pull/expected/myfile4 rename to test/integration/pull/expected/repo/myfile4 diff --git a/test/integration/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea00 b/test/integration/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea00 deleted file mode 100644 index 0ed3c76d8..000000000 --- a/test/integration/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea00 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙÊŒNÇJ\yŒ˜L¨à")´·×#tûyðS5[Ë¥íª€*©`”eê3³’—ì©‹T^¸ÏÂ%¦{ç⧽êÓ iõí½é-U{IÏ>H@†+¢;ë9iú'wö+ë¦ä4í,Ý \ No newline at end of file diff --git a/test/integration/pull/expected_remote/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa b/test/integration/pull/expected_remote/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa deleted file mode 100644 index a89fa981c..000000000 Binary files a/test/integration/pull/expected_remote/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa and /dev/null differ diff --git a/test/integration/pull/expected_remote/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a b/test/integration/pull/expected_remote/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a deleted file mode 100644 index 2b7ab37ad..000000000 Binary files a/test/integration/pull/expected_remote/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a and /dev/null differ diff --git a/test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 b/test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 deleted file mode 100644 index 335077711..000000000 --- a/test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚d2“I"BW=Æ4`ÁØR"èííÜ~Þâ—µµ¥[Èt껪õ•!’ “#LhækdOŠ„ f“]_Ý"rò¬ƒ‚”LZ$V,Ï3ÖÉE_£1òîu·Ãh¯Ãx×´í©—²¶›FJ™³#{pÎõ˜êú'7í[—§’ùôâ90 \ No newline at end of file diff --git a/test/integration/pull/expected_remote/packed-refs b/test/integration/pull/expected_remote/packed-refs deleted file mode 100644 index 2683a6cf6..000000000 --- a/test/integration/pull/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -6ad6c42187d356f4eab4f004cca17863746adec1 refs/heads/master diff --git a/test/integration/pull/setup.sh b/test/integration/pull/setup.sh index ffe8a3b6d..34646d663 100644 --- a/test/integration/pull/setup.sh +++ b/test/integration/pull/setup.sh @@ -25,12 +25,12 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo # the test is to ensure that we actually can pull these two commits back from the origin git reset --hard HEAD~2 -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/FETCH_HEAD b/test/integration/pullAndSetUpstream/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index dad3f2b15..000000000 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -766e681a51daa75233c1c4ae8845be2c893577d5 branch 'master' of ../actual_remote diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/ORIG_HEAD b/test/integration/pullAndSetUpstream/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 013d7edf1..000000000 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -c9fd61f40de25556977e063683d1de612f931ccb diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/index b/test/integration/pullAndSetUpstream/expected/.git_keep/index deleted file mode 100644 index f658c6ea4..000000000 Binary files a/test/integration/pullAndSetUpstream/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/logs/HEAD b/test/integration/pullAndSetUpstream/expected/.git_keep/logs/HEAD deleted file mode 100644 index a0abb8bc8..000000000 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 972fb9caab8b8536ae38687fec98304b76748b9d CI 1642217132 +1100 commit (initial): myfile1 -972fb9caab8b8536ae38687fec98304b76748b9d c9fd61f40de25556977e063683d1de612f931ccb CI 1642217132 +1100 commit: myfile2 -c9fd61f40de25556977e063683d1de612f931ccb 06d3929607b7519beb45ca67165a1f2b5c0e578b CI 1642217132 +1100 commit: myfile3 -06d3929607b7519beb45ca67165a1f2b5c0e578b 766e681a51daa75233c1c4ae8845be2c893577d5 CI 1642217132 +1100 commit: myfile4 -766e681a51daa75233c1c4ae8845be2c893577d5 c9fd61f40de25556977e063683d1de612f931ccb CI 1642217132 +1100 reset: moving to HEAD~2 -c9fd61f40de25556977e063683d1de612f931ccb 766e681a51daa75233c1c4ae8845be2c893577d5 CI 1642217139 +1100 rebase -i (start): checkout 766e681a51daa75233c1c4ae8845be2c893577d5 -766e681a51daa75233c1c4ae8845be2c893577d5 766e681a51daa75233c1c4ae8845be2c893577d5 CI 1642217139 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/heads/master b/test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index d6b607c56..000000000 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 972fb9caab8b8536ae38687fec98304b76748b9d CI 1642217132 +1100 commit (initial): myfile1 -972fb9caab8b8536ae38687fec98304b76748b9d c9fd61f40de25556977e063683d1de612f931ccb CI 1642217132 +1100 commit: myfile2 -c9fd61f40de25556977e063683d1de612f931ccb 06d3929607b7519beb45ca67165a1f2b5c0e578b CI 1642217132 +1100 commit: myfile3 -06d3929607b7519beb45ca67165a1f2b5c0e578b 766e681a51daa75233c1c4ae8845be2c893577d5 CI 1642217132 +1100 commit: myfile4 -766e681a51daa75233c1c4ae8845be2c893577d5 c9fd61f40de25556977e063683d1de612f931ccb CI 1642217132 +1100 reset: moving to HEAD~2 -c9fd61f40de25556977e063683d1de612f931ccb 766e681a51daa75233c1c4ae8845be2c893577d5 CI 1642217139 +1100 rebase -i (finish): refs/heads/master onto 766e681a51daa75233c1c4ae8845be2c893577d5 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 9c9943bda..000000000 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 766e681a51daa75233c1c4ae8845be2c893577d5 CI 1642217132 +1100 fetch origin: storing head diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b b/test/integration/pullAndSetUpstream/expected/.git_keep/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b deleted file mode 100644 index 32e93478b..000000000 Binary files a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5 b/test/integration/pullAndSetUpstream/expected/.git_keep/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5 deleted file mode 100644 index 527c680a2..000000000 Binary files a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5 and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d b/test/integration/pullAndSetUpstream/expected/.git_keep/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d deleted file mode 100644 index ab6f93898..000000000 Binary files a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/c9/fd61f40de25556977e063683d1de612f931ccb b/test/integration/pullAndSetUpstream/expected/.git_keep/objects/c9/fd61f40de25556977e063683d1de612f931ccb deleted file mode 100644 index cb10ffe51..000000000 Binary files a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/c9/fd61f40de25556977e063683d1de612f931ccb and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/refs/heads/master b/test/integration/pullAndSetUpstream/expected/.git_keep/refs/heads/master deleted file mode 100644 index e6edfeca1..000000000 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -766e681a51daa75233c1c4ae8845be2c893577d5 diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullAndSetUpstream/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index e6edfeca1..000000000 --- a/test/integration/pullAndSetUpstream/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -766e681a51daa75233c1c4ae8845be2c893577d5 diff --git a/test/integration/pullMerge/expected/.git_keep/HEAD b/test/integration/pullAndSetUpstream/expected/origin/HEAD similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/HEAD rename to test/integration/pullAndSetUpstream/expected/origin/HEAD diff --git a/test/integration/pullAndSetUpstream/expected/origin/config b/test/integration/pullAndSetUpstream/expected/origin/config new file mode 100644 index 000000000..142886cf6 --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullAndSetUpstream/actual/./repo diff --git a/test/integration/pullMerge/expected/.git_keep/description b/test/integration/pullAndSetUpstream/expected/origin/description similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/description rename to test/integration/pullAndSetUpstream/expected/origin/description diff --git a/test/integration/pullMerge/expected/.git_keep/info/exclude b/test/integration/pullAndSetUpstream/expected/origin/info/exclude similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/info/exclude rename to test/integration/pullAndSetUpstream/expected/origin/info/exclude diff --git a/test/integration/pullMerge/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullAndSetUpstream/expected/origin/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 b/test/integration/pullAndSetUpstream/expected/origin/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 new file mode 100644 index 000000000..610741e7b --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/origin/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJF§“))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çðPÉDŠÂY°‹XÍÔg¦Ó½sñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éI\½wg='MÿäξeYÝ3“,Õ \ No newline at end of file diff --git a/test/integration/pullMerge/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullAndSetUpstream/expected/origin/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac b/test/integration/pullAndSetUpstream/expected/origin/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac new file mode 100644 index 000000000..b3f8ea3c9 Binary files /dev/null and b/test/integration/pullAndSetUpstream/expected/origin/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac differ diff --git a/test/integration/pullMerge/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullAndSetUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullAndSetUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullAndSetUpstream/expected/origin/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 b/test/integration/pullAndSetUpstream/expected/origin/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 new file mode 100644 index 000000000..626fe4440 Binary files /dev/null and b/test/integration/pullAndSetUpstream/expected/origin/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 differ diff --git a/test/integration/pullAndSetUpstream/expected/origin/objects/f1/1c72f0484c803d954446036bf464c3b8523330 b/test/integration/pullAndSetUpstream/expected/origin/objects/f1/1c72f0484c803d954446036bf464c3b8523330 new file mode 100644 index 000000000..44a011289 Binary files /dev/null and b/test/integration/pullAndSetUpstream/expected/origin/objects/f1/1c72f0484c803d954446036bf464c3b8523330 differ diff --git a/test/integration/pullAndSetUpstream/expected/origin/packed-refs b/test/integration/pullAndSetUpstream/expected/origin/packed-refs new file mode 100644 index 000000000..3f7c0d7ac --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +dffd8a2962e840dfcbce39a0315e0cded7873b29 refs/heads/master diff --git a/test/integration/pullMerge/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..15edd8246 --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +dffd8a2962e840dfcbce39a0315e0cded7873b29 branch 'master' of ../origin diff --git a/test/integration/pullMerge/expected_remote/HEAD b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pullMerge/expected_remote/HEAD rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/HEAD diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..111490020 --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +f11c72f0484c803d954446036bf464c3b8523330 diff --git a/test/integration/forcePush/expected/.git_keep/config b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/config similarity index 92% rename from test/integration/forcePush/expected/.git_keep/config rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/config index 821803a3e..7721ae814 100644 --- a/test/integration/forcePush/expected/.git_keep/config +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pullMerge/expected_remote/description b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pullMerge/expected_remote/description rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/description diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/index b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/index new file mode 100644 index 000000000..c1cf7c23d Binary files /dev/null and b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/index differ diff --git a/test/integration/pullMerge/expected_remote/info/exclude b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pullMerge/expected_remote/info/exclude rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..e3b32bef3 --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 CI 1648348714 +1100 commit (initial): myfile1 +1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 f11c72f0484c803d954446036bf464c3b8523330 CI 1648348714 +1100 commit: myfile2 +f11c72f0484c803d954446036bf464c3b8523330 64d950eb46bf13d35cd27dd7a3ad621422dee6ac CI 1648348715 +1100 commit: myfile3 +64d950eb46bf13d35cd27dd7a3ad621422dee6ac dffd8a2962e840dfcbce39a0315e0cded7873b29 CI 1648348715 +1100 commit: myfile4 +dffd8a2962e840dfcbce39a0315e0cded7873b29 f11c72f0484c803d954446036bf464c3b8523330 CI 1648348715 +1100 reset: moving to HEAD~2 +f11c72f0484c803d954446036bf464c3b8523330 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI 1648348721 +1100 rebase -i (start): checkout dffd8a2962e840dfcbce39a0315e0cded7873b29 +dffd8a2962e840dfcbce39a0315e0cded7873b29 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI 1648348721 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..49a6912d0 --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 CI 1648348714 +1100 commit (initial): myfile1 +1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 f11c72f0484c803d954446036bf464c3b8523330 CI 1648348714 +1100 commit: myfile2 +f11c72f0484c803d954446036bf464c3b8523330 64d950eb46bf13d35cd27dd7a3ad621422dee6ac CI 1648348715 +1100 commit: myfile3 +64d950eb46bf13d35cd27dd7a3ad621422dee6ac dffd8a2962e840dfcbce39a0315e0cded7873b29 CI 1648348715 +1100 commit: myfile4 +dffd8a2962e840dfcbce39a0315e0cded7873b29 f11c72f0484c803d954446036bf464c3b8523330 CI 1648348715 +1100 reset: moving to HEAD~2 +f11c72f0484c803d954446036bf464c3b8523330 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI 1648348721 +1100 rebase -i (finish): refs/heads/master onto dffd8a2962e840dfcbce39a0315e0cded7873b29 diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..b8dece53f --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI 1648348715 +1100 fetch origin: storing head diff --git a/test/integration/pullMerge/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullMerge/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 new file mode 100644 index 000000000..610741e7b --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJF§“))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çðPÉDŠÂY°‹XÍÔg¦Ó½sñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éI\½wg='MÿäξeYÝ3“,Õ \ No newline at end of file diff --git a/test/integration/pullMerge/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac new file mode 100644 index 000000000..b3f8ea3c9 Binary files /dev/null and b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac differ diff --git a/test/integration/pullMerge/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullMerge/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullMerge/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullMerge/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 new file mode 100644 index 000000000..626fe4440 Binary files /dev/null and b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 differ diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/f1/1c72f0484c803d954446036bf464c3b8523330 b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/f1/1c72f0484c803d954446036bf464c3b8523330 new file mode 100644 index 000000000..44a011289 Binary files /dev/null and b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/f1/1c72f0484c803d954446036bf464c3b8523330 differ diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..dd134e7e3 --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +dffd8a2962e840dfcbce39a0315e0cded7873b29 diff --git a/test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..dd134e7e3 --- /dev/null +++ b/test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +dffd8a2962e840dfcbce39a0315e0cded7873b29 diff --git a/test/integration/pullMerge/expected/myfile1 b/test/integration/pullAndSetUpstream/expected/repo/myfile1 similarity index 100% rename from test/integration/pullMerge/expected/myfile1 rename to test/integration/pullAndSetUpstream/expected/repo/myfile1 diff --git a/test/integration/pullMerge/expected/myfile2 b/test/integration/pullAndSetUpstream/expected/repo/myfile2 similarity index 100% rename from test/integration/pullMerge/expected/myfile2 rename to test/integration/pullAndSetUpstream/expected/repo/myfile2 diff --git a/test/integration/pullAndSetUpstream/expected/myfile3 b/test/integration/pullAndSetUpstream/expected/repo/myfile3 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/myfile3 rename to test/integration/pullAndSetUpstream/expected/repo/myfile3 diff --git a/test/integration/pullAndSetUpstream/expected/myfile4 b/test/integration/pullAndSetUpstream/expected/repo/myfile4 similarity index 100% rename from test/integration/pullAndSetUpstream/expected/myfile4 rename to test/integration/pullAndSetUpstream/expected/repo/myfile4 diff --git a/test/integration/pullAndSetUpstream/expected_remote/config b/test/integration/pullAndSetUpstream/expected_remote/config deleted file mode 100644 index 6457661a3..000000000 --- a/test/integration/pullAndSetUpstream/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullAndSetUpstream/./actual diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b b/test/integration/pullAndSetUpstream/expected_remote/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b deleted file mode 100644 index 32e93478b..000000000 Binary files a/test/integration/pullAndSetUpstream/expected_remote/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5 b/test/integration/pullAndSetUpstream/expected_remote/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5 deleted file mode 100644 index 527c680a2..000000000 Binary files a/test/integration/pullAndSetUpstream/expected_remote/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5 and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d b/test/integration/pullAndSetUpstream/expected_remote/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d deleted file mode 100644 index ab6f93898..000000000 Binary files a/test/integration/pullAndSetUpstream/expected_remote/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected_remote/objects/c9/fd61f40de25556977e063683d1de612f931ccb b/test/integration/pullAndSetUpstream/expected_remote/objects/c9/fd61f40de25556977e063683d1de612f931ccb deleted file mode 100644 index cb10ffe51..000000000 Binary files a/test/integration/pullAndSetUpstream/expected_remote/objects/c9/fd61f40de25556977e063683d1de612f931ccb and /dev/null differ diff --git a/test/integration/pullAndSetUpstream/expected_remote/packed-refs b/test/integration/pullAndSetUpstream/expected_remote/packed-refs deleted file mode 100644 index 66a0f8392..000000000 --- a/test/integration/pullAndSetUpstream/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -766e681a51daa75233c1c4ae8845be2c893577d5 refs/heads/master diff --git a/test/integration/pullAndSetUpstream/setup.sh b/test/integration/pullAndSetUpstream/setup.sh index f0c7cf842..757cef9de 100644 --- a/test/integration/pullAndSetUpstream/setup.sh +++ b/test/integration/pullAndSetUpstream/setup.sh @@ -25,11 +25,11 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo # the test is to ensure that we actually can pull these two commits back from the origin git reset --hard HEAD~2 -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin diff --git a/test/integration/pullMerge/expected/.git_keep/FETCH_HEAD b/test/integration/pullMerge/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index e2a5e2793..000000000 --- a/test/integration/pullMerge/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -7f157a65ec0c8d6cffce08d6768e6733939e75a1 branch 'master' of ../actual_remote diff --git a/test/integration/pullMerge/expected/.git_keep/ORIG_HEAD b/test/integration/pullMerge/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index d3db7a1d9..000000000 --- a/test/integration/pullMerge/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -2a0805355a8040f9eebfa2dbf70b8bc313d6f456 diff --git a/test/integration/pullMerge/expected/.git_keep/index b/test/integration/pullMerge/expected/.git_keep/index deleted file mode 100644 index d8f385b74..000000000 Binary files a/test/integration/pullMerge/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pullMerge/expected/.git_keep/logs/HEAD b/test/integration/pullMerge/expected/.git_keep/logs/HEAD deleted file mode 100644 index bd085fb7f..000000000 --- a/test/integration/pullMerge/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c0bda1656e7695870ed15839643564b0a9283a8 CI 1634896907 +1100 commit (initial): myfile1 -7c0bda1656e7695870ed15839643564b0a9283a8 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 commit: myfile2 -5529eadf398ce89032744d5f4151000f07d70124 703e85166069a42b4254af06b68dffc159ea3f24 CI 1634896907 +1100 commit: myfile3 -703e85166069a42b4254af06b68dffc159ea3f24 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI 1634896907 +1100 commit: myfile4 -7f157a65ec0c8d6cffce08d6768e6733939e75a1 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 reset: moving to head^^ -5529eadf398ce89032744d5f4151000f07d70124 2a0805355a8040f9eebfa2dbf70b8bc313d6f456 CI 1634896907 +1100 commit: myfile4 -2a0805355a8040f9eebfa2dbf70b8bc313d6f456 b10baba2f9d877322f94f8770e2e0c8ab1db6bcc CI 1634896908 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master b/test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index bd085fb7f..000000000 --- a/test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c0bda1656e7695870ed15839643564b0a9283a8 CI 1634896907 +1100 commit (initial): myfile1 -7c0bda1656e7695870ed15839643564b0a9283a8 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 commit: myfile2 -5529eadf398ce89032744d5f4151000f07d70124 703e85166069a42b4254af06b68dffc159ea3f24 CI 1634896907 +1100 commit: myfile3 -703e85166069a42b4254af06b68dffc159ea3f24 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI 1634896907 +1100 commit: myfile4 -7f157a65ec0c8d6cffce08d6768e6733939e75a1 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 reset: moving to head^^ -5529eadf398ce89032744d5f4151000f07d70124 2a0805355a8040f9eebfa2dbf70b8bc313d6f456 CI 1634896907 +1100 commit: myfile4 -2a0805355a8040f9eebfa2dbf70b8bc313d6f456 b10baba2f9d877322f94f8770e2e0c8ab1db6bcc CI 1634896908 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index cd4098ff1..000000000 --- a/test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI 1634896907 +1100 fetch origin: storing head diff --git a/test/integration/pullMerge/expected/.git_keep/objects/2a/0805355a8040f9eebfa2dbf70b8bc313d6f456 b/test/integration/pullMerge/expected/.git_keep/objects/2a/0805355a8040f9eebfa2dbf70b8bc313d6f456 deleted file mode 100644 index 8988a8d06..000000000 Binary files a/test/integration/pullMerge/expected/.git_keep/objects/2a/0805355a8040f9eebfa2dbf70b8bc313d6f456 and /dev/null differ diff --git a/test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d70124 b/test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d70124 deleted file mode 100644 index c0dd8a01d..000000000 --- a/test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d70124 +++ /dev/null @@ -1,2 +0,0 @@ -xŽK -Â0@]çÙ 2“Ï$"BW=Æ´™`ÁØR"èííÜ>¼7¯­-Ý"‡SßU­$P"W(Eµ2±׉ä£ÉžÌA©®ê¦}ëòTg~j|9] \ No newline at end of file diff --git a/test/integration/pullMerge/expected/.git_keep/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 b/test/integration/pullMerge/expected/.git_keep/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 deleted file mode 100644 index 48dfdc50c..000000000 Binary files a/test/integration/pullMerge/expected/.git_keep/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 and /dev/null differ diff --git a/test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 b/test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 deleted file mode 100644 index b08614b98..000000000 --- a/test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0@Q×9Åì™iÇI"BW=FšL°Ð!R"èííÜ~üÜÌÖÄrê»* J®˜dñQCaV -R ‰ªç…Ç"\S¾.½û³í0Íp›æ‡~’½6½äfw 9D‰èáL„èŽzLºþÉ}ëº)¹5à,ã \ No newline at end of file diff --git a/test/integration/pullMerge/expected/.git_keep/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 b/test/integration/pullMerge/expected/.git_keep/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 deleted file mode 100644 index 1af721127..000000000 Binary files a/test/integration/pullMerge/expected/.git_keep/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 and /dev/null differ diff --git a/test/integration/pullMerge/expected/.git_keep/objects/b1/0baba2f9d877322f94f8770e2e0c8ab1db6bcc b/test/integration/pullMerge/expected/.git_keep/objects/b1/0baba2f9d877322f94f8770e2e0c8ab1db6bcc deleted file mode 100644 index d3842cf9b..000000000 Binary files a/test/integration/pullMerge/expected/.git_keep/objects/b1/0baba2f9d877322f94f8770e2e0c8ab1db6bcc and /dev/null differ diff --git a/test/integration/pullMerge/expected/.git_keep/refs/heads/master b/test/integration/pullMerge/expected/.git_keep/refs/heads/master deleted file mode 100644 index 547542fbd..000000000 --- a/test/integration/pullMerge/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -b10baba2f9d877322f94f8770e2e0c8ab1db6bcc diff --git a/test/integration/pullMerge/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullMerge/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 0b78ce1e0..000000000 --- a/test/integration/pullMerge/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -7f157a65ec0c8d6cffce08d6768e6733939e75a1 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/HEAD b/test/integration/pullMerge/expected/origin/HEAD similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/HEAD rename to test/integration/pullMerge/expected/origin/HEAD diff --git a/test/integration/forcePush/expected_remote/config b/test/integration/pullMerge/expected/origin/config similarity index 78% rename from test/integration/forcePush/expected_remote/config rename to test/integration/pullMerge/expected/origin/config index ea4d9033b..90705ff13 100644 --- a/test/integration/forcePush/expected_remote/config +++ b/test/integration/pullMerge/expected/origin/config @@ -5,4 +5,4 @@ ignorecase = true precomposeunicode = true [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePush/./actual + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMerge/actual/./repo diff --git a/test/integration/pullMergeConflict/expected/.git_keep/description b/test/integration/pullMerge/expected/origin/description similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/description rename to test/integration/pullMerge/expected/origin/description diff --git a/test/integration/pullMergeConflict/expected/.git_keep/info/exclude b/test/integration/pullMerge/expected/origin/info/exclude similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/info/exclude rename to test/integration/pullMerge/expected/origin/info/exclude diff --git a/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e b/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e new file mode 100644 index 000000000..ce0f31a5a Binary files /dev/null and b/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e differ diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad b/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad new file mode 100644 index 000000000..660fe0a45 --- /dev/null +++ b/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJF§“))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çðPÉDŠÂY°‹XÍÔg¦Ó½sñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éI¸"zïÎzNšþÉ}˲*º6%,å \ No newline at end of file diff --git a/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d b/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d new file mode 100644 index 000000000..e4b84263d --- /dev/null +++ b/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9Eö‚Ì$“™D„®zŒ´™`ÁØR"èííÜ~ÞâÏkkK·˜èÔwUë*£ðÈÇŠ4!sˆÙVaG>Ì9$4[ÞõÕ-”PŠH$`ŸÐUõZ5W)nb‰0©&e5ùÝën‡Ñ^‡ñ®ŸÜ¶§^æµÝ,2EOQXìÀõ˜êú'7í[—§’ùôô9% \ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullMerge/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullMerge/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 b/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 new file mode 100644 index 000000000..4e97dab19 Binary files /dev/null and b/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 differ diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullMerge/expected/origin/packed-refs b/test/integration/pullMerge/expected/origin/packed-refs new file mode 100644 index 000000000..e6e25ae85 --- /dev/null +++ b/test/integration/pullMerge/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +291b985e75f255f9947f064aee9e1f37af1a930d refs/heads/master diff --git a/test/integration/push/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/push/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..0b3113c2b --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +291b985e75f255f9947f064aee9e1f37af1a930d branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected_remote/HEAD b/test/integration/pullMerge/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/HEAD rename to test/integration/pullMerge/expected/repo/.git_keep/HEAD diff --git a/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..83635ede7 --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +673a4237450c6ea2a27b18f1d7a3c9293c5606ea diff --git a/test/integration/pullMergeConflict/expected/.git_keep/config b/test/integration/pullMerge/expected/repo/.git_keep/config similarity index 93% rename from test/integration/pullMergeConflict/expected/.git_keep/config rename to test/integration/pullMerge/expected/repo/.git_keep/config index 110d1b43e..1cff3a489 100644 --- a/test/integration/pullMergeConflict/expected/.git_keep/config +++ b/test/integration/pullMerge/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pullMergeConflict/expected_remote/description b/test/integration/pullMerge/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/description rename to test/integration/pullMerge/expected/repo/.git_keep/description diff --git a/test/integration/pullMerge/expected/repo/.git_keep/index b/test/integration/pullMerge/expected/repo/.git_keep/index new file mode 100644 index 000000000..fc9d5cb17 Binary files /dev/null and b/test/integration/pullMerge/expected/repo/.git_keep/index differ diff --git a/test/integration/pullMergeConflict/expected_remote/info/exclude b/test/integration/pullMerge/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/info/exclude rename to test/integration/pullMerge/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD b/test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..b3175cf78 --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 224786fb3e4a16b22b4e2b43fe01d7797491adad CI 1648348767 +1100 commit (initial): myfile1 +224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 commit: myfile2 +82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI 1648348767 +1100 commit: myfile3 +0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 commit: myfile4 +291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 reset: moving to HEAD~2 +82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI 1648348767 +1100 commit: myfile4 +673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..b3175cf78 --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 224786fb3e4a16b22b4e2b43fe01d7797491adad CI 1648348767 +1100 commit (initial): myfile1 +224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 commit: myfile2 +82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI 1648348767 +1100 commit: myfile3 +0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 commit: myfile4 +291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 reset: moving to HEAD~2 +82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI 1648348767 +1100 commit: myfile4 +673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..57e616700 --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 fetch origin: storing head diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e b/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e new file mode 100644 index 000000000..ce0f31a5a Binary files /dev/null and b/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e differ diff --git a/test/integration/pullMergeConflict/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMerge/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullMerge/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad b/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad new file mode 100644 index 000000000..660fe0a45 --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJF§“))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çðPÉDŠÂY°‹XÍÔg¦Ó½sñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éI¸"zïÎzNšþÉ}˲*º6%,å \ No newline at end of file diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d b/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d new file mode 100644 index 000000000..e4b84263d --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9Eö‚Ì$“™D„®zŒ´™`ÁØR"èííÜ~ÞâÏkkK·˜èÔwUë*£ðÈÇŠ4!sˆÙVaG>Ì9$4[ÞõÕ-”PŠH$`ŸÐUõZ5W)nb‰0©&e5ùÝën‡Ñ^‡ñ®ŸÜ¶§^æµÝ,2EOQXìÀõ˜êú'7í[—§’ùôô9% \ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullMerge/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullMerge/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea b/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea new file mode 100644 index 000000000..c630a6f65 Binary files /dev/null and b/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 b/test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 new file mode 100644 index 000000000..4e97dab19 Binary files /dev/null and b/test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 differ diff --git a/test/integration/pullMergeConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 new file mode 100644 index 000000000..f75c94690 Binary files /dev/null and b/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 differ diff --git a/test/integration/pullMergeConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 new file mode 100644 index 000000000..5e9361d35 Binary files /dev/null and b/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 differ diff --git a/test/integration/pullMergeConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master b/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..b1c046dd7 --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +a61316509295a5644a82e38e8bd455422fe477c5 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..c2b075905 --- /dev/null +++ b/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +291b985e75f255f9947f064aee9e1f37af1a930d diff --git a/test/integration/pullMergeConflict/expected/myfile1 b/test/integration/pullMerge/expected/repo/myfile1 similarity index 100% rename from test/integration/pullMergeConflict/expected/myfile1 rename to test/integration/pullMerge/expected/repo/myfile1 diff --git a/test/integration/pullMergeConflict/expected/myfile2 b/test/integration/pullMerge/expected/repo/myfile2 similarity index 100% rename from test/integration/pullMergeConflict/expected/myfile2 rename to test/integration/pullMerge/expected/repo/myfile2 diff --git a/test/integration/pullMerge/expected/myfile3 b/test/integration/pullMerge/expected/repo/myfile3 similarity index 100% rename from test/integration/pullMerge/expected/myfile3 rename to test/integration/pullMerge/expected/repo/myfile3 diff --git a/test/integration/pullMerge/expected/myfile4 b/test/integration/pullMerge/expected/repo/myfile4 similarity index 100% rename from test/integration/pullMerge/expected/myfile4 rename to test/integration/pullMerge/expected/repo/myfile4 diff --git a/test/integration/pullMerge/expected_remote/objects/55/29eadf398ce89032744d5f4151000f07d70124 b/test/integration/pullMerge/expected_remote/objects/55/29eadf398ce89032744d5f4151000f07d70124 deleted file mode 100644 index c0dd8a01d..000000000 --- a/test/integration/pullMerge/expected_remote/objects/55/29eadf398ce89032744d5f4151000f07d70124 +++ /dev/null @@ -1,2 +0,0 @@ -xŽK -Â0@]çÙ 2“Ï$"BW=Æ´™`ÁØR"èííÜ>¼7¯­-Ý"‡SßU­$P"W(Eµ2±׉ä£ÉžÌA©®ê¦}ëòTg~j|9] \ No newline at end of file diff --git a/test/integration/pullMerge/expected_remote/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 b/test/integration/pullMerge/expected_remote/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 deleted file mode 100644 index 48dfdc50c..000000000 Binary files a/test/integration/pullMerge/expected_remote/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 and /dev/null differ diff --git a/test/integration/pullMerge/expected_remote/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 b/test/integration/pullMerge/expected_remote/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 deleted file mode 100644 index b08614b98..000000000 --- a/test/integration/pullMerge/expected_remote/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0@Q×9Åì™iÇI"BW=FšL°Ð!R"èííÜ~üÜÌÖÄrê»* J®˜dñQCaV -R ‰ªç…Ç"\S¾.½û³í0Íp›æ‡~’½6½äfw 9D‰èáL„èŽzLºþÉ}ëº)¹5à,ã \ No newline at end of file diff --git a/test/integration/pullMerge/expected_remote/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 b/test/integration/pullMerge/expected_remote/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 deleted file mode 100644 index 1af721127..000000000 Binary files a/test/integration/pullMerge/expected_remote/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 and /dev/null differ diff --git a/test/integration/pullMerge/expected_remote/packed-refs b/test/integration/pullMerge/expected_remote/packed-refs deleted file mode 100644 index 0ec136723..000000000 --- a/test/integration/pullMerge/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -7f157a65ec0c8d6cffce08d6768e6733939e75a1 refs/heads/master diff --git a/test/integration/pullMerge/setup.sh b/test/integration/pullMerge/setup.sh index 379a95362..36d825537 100644 --- a/test/integration/pullMerge/setup.sh +++ b/test/integration/pullMerge/setup.sh @@ -25,9 +25,9 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo git reset --hard HEAD~2 @@ -35,7 +35,7 @@ echo test4 > myfile4 git add . git commit -am "myfile4" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pullMergeConflict/expected/.git_keep/FETCH_HEAD b/test/integration/pullMergeConflict/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index bd1ba7678..000000000 --- a/test/integration/pullMergeConflict/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -38699899bb94dfae74e3e55cf5bd6d92e6f3292a branch 'master' of ../actual_remote diff --git a/test/integration/pullMergeConflict/expected/.git_keep/ORIG_HEAD b/test/integration/pullMergeConflict/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 703055cf2..000000000 --- a/test/integration/pullMergeConflict/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7dba68a0030313e27b8dd5da2076952629485f2d diff --git a/test/integration/pullMergeConflict/expected/.git_keep/index b/test/integration/pullMergeConflict/expected/.git_keep/index deleted file mode 100644 index d9ffd9453..000000000 Binary files a/test/integration/pullMergeConflict/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pullMergeConflict/expected/.git_keep/logs/HEAD b/test/integration/pullMergeConflict/expected/.git_keep/logs/HEAD deleted file mode 100644 index 566b28a05..000000000 --- a/test/integration/pullMergeConflict/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 f0e8e7922de77a5ab20b924640c8b8435bae0b0b CI 1634896911 +1100 commit (initial): myfile1 -f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 commit: myfile2 -ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI 1634896911 +1100 commit: myfile3 -80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI 1634896911 +1100 commit: myfile4 -38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 reset: moving to head^^ -ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI 1634896911 +1100 commit: myfile4 conflict -7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI 1634896916 +1100 commit (merge): Merge branch 'master' of ../actual_remote diff --git a/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/heads/master b/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 566b28a05..000000000 --- a/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 f0e8e7922de77a5ab20b924640c8b8435bae0b0b CI 1634896911 +1100 commit (initial): myfile1 -f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 commit: myfile2 -ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI 1634896911 +1100 commit: myfile3 -80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI 1634896911 +1100 commit: myfile4 -38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 reset: moving to head^^ -ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI 1634896911 +1100 commit: myfile4 conflict -7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI 1634896916 +1100 commit (merge): Merge branch 'master' of ../actual_remote diff --git a/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 4473fe625..000000000 --- a/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI 1634896911 +1100 fetch origin: storing head diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f b/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f deleted file mode 100644 index 5fcd3c3ea..000000000 Binary files a/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f and /dev/null differ diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a b/test/integration/pullMergeConflict/expected/.git_keep/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a deleted file mode 100644 index c7b25d78c..000000000 --- a/test/integration/pullMergeConflict/expected/.git_keep/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -Â0@Q×9Eö‚Ì4“i"BW=F:Á‚±¥DÐÛÛ#¸ý¼Å—µÖ¥yÌtj»ªïŒ±'ˆPH†4!sL%DÖž; -QJÌ趲ë«ù–ŠÎ€2OŒ–5“p‰AB6˜mƒ(Ù•w{¬»FÆ»~JÝžz‘µÞ 1648349178 +1100 commit (initial): myfile1 +7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 +77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 +c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 +29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 +77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict +4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..d67e84881 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI 1648349178 +1100 commit (initial): myfile1 +7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 +77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 +c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 +29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 +77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict +4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..9d875f2ce --- /dev/null +++ b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 fetch origin: storing head diff --git a/test/integration/pullRebase/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullRebase/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c new file mode 100644 index 000000000..26794f8c9 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9Eö‚d’É$¡«cšÎ`ÁØR"èííÜ~Þâ×µµ¥[(x껈õJÐE²Ãp¢˜9D’DC¬ ˜wyu[d§èQ„¦X<‚HU•¹*#&Ï™æâÓløÝën‡Ñ^‡ñ.nÛS.um7 „9`”íÀ9sÔcªËŸÜ´¯.OAó9w \ No newline at end of file diff --git a/test/integration/pullRebase/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullMergeConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullMergeConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 new file mode 100644 index 000000000..53c1056c1 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 @@ -0,0 +1,2 @@ +xŽA +Â@ E]Ï)f/HÒ¦“DW=FšI±Ði¥Œ ··Gp÷y¼߶RæhOuwê9(`cITÆ„Ž€Ò‰¦®7BÊÄ”ÂKw_kdVîA ÍÜ°Š›ê±Ž&÷ÙX‚¾ësÛãcˆ×Çp÷–×âÛÊ-b"i©G–xF=NUÿSå;Í‹S´m–Ùjø´#=] \ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 new file mode 100644 index 000000000..fa0ad87b7 Binary files /dev/null and b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 differ diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 new file mode 100644 index 000000000..4dcbc87d0 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJF§“J\yŒ˜L¨à")´·×#tûyðS5[ ñ¥íªà•Sñ‘—0¨d"Eá,ØE,ê3S‰éÞ¹øi¯ºÃ4ÃcšGýF{ozKÕž€LÒÓ€AàŠè½;ë9iú'wö+ë¦è5",ß \ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 new file mode 100644 index 000000000..2a3309a4c Binary files /dev/null and b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 differ diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae diff --git a/test/integration/pullRebase/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullRebase/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 similarity index 100% rename from test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c2/5833e74799f64c317fe3f112f934fcc57b71f9 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c2/5833e74799f64c317fe3f112f934fcc57b71f9 new file mode 100644 index 000000000..03f46ce9a Binary files /dev/null and b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c2/5833e74799f64c317fe3f112f934fcc57b71f9 differ diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d new file mode 100644 index 000000000..72dee6f91 Binary files /dev/null and b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d differ diff --git a/test/integration/pullRebase/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullRebase/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullMergeConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..4512ce2dd --- /dev/null +++ b/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +c25833e74799f64c317fe3f112f934fcc57b71f9 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..9f6715ee9 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +29c0636a86cc64292b7a6b1083c2df10de9cde6c diff --git a/test/integration/pullRebase/expected/myfile1 b/test/integration/pullMergeConflict/expected/repo/myfile1 similarity index 100% rename from test/integration/pullRebase/expected/myfile1 rename to test/integration/pullMergeConflict/expected/repo/myfile1 diff --git a/test/integration/pullRebase/expected/myfile2 b/test/integration/pullMergeConflict/expected/repo/myfile2 similarity index 100% rename from test/integration/pullRebase/expected/myfile2 rename to test/integration/pullMergeConflict/expected/repo/myfile2 diff --git a/test/integration/pullMergeConflict/expected/myfile3 b/test/integration/pullMergeConflict/expected/repo/myfile3 similarity index 100% rename from test/integration/pullMergeConflict/expected/myfile3 rename to test/integration/pullMergeConflict/expected/repo/myfile3 diff --git a/test/integration/pullMergeConflict/expected/myfile4 b/test/integration/pullMergeConflict/expected/repo/myfile4 similarity index 100% rename from test/integration/pullMergeConflict/expected/myfile4 rename to test/integration/pullMergeConflict/expected/repo/myfile4 diff --git a/test/integration/pullMergeConflict/expected_remote/config b/test/integration/pullMergeConflict/expected_remote/config deleted file mode 100644 index 082441c96..000000000 --- a/test/integration/pullMergeConflict/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/./actual diff --git a/test/integration/pullMergeConflict/expected_remote/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a b/test/integration/pullMergeConflict/expected_remote/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a deleted file mode 100644 index c7b25d78c..000000000 --- a/test/integration/pullMergeConflict/expected_remote/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -Â0@Q×9Eö‚Ì4“i"BW=F:Á‚±¥DÐÛÛ#¸ý¼Å—µÖ¥yÌtj»ªïŒ±'ˆPH†4!sL%DÖž; -QJÌ趲ë«ù–ŠÎ€2OŒ–5“p‰AB6˜mƒ(Ù•w{¬»FÆ»~JÝžz‘µÞ myfile4 git add . git commit -am "myfile4 conflict" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pullRebase/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebase/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index a05fa9894..000000000 --- a/test/integration/pullRebase/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -d0e04b2bced3bc76f0abf50698a7ab774cd54568 branch 'master' of ../actual_remote diff --git a/test/integration/pullRebase/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebase/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 66241013d..000000000 --- a/test/integration/pullRebase/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7b21277988b03a5fd9e933126e8d1f31d2498d08 diff --git a/test/integration/pullRebase/expected/.git_keep/index b/test/integration/pullRebase/expected/.git_keep/index deleted file mode 100644 index 3e4466b50..000000000 Binary files a/test/integration/pullRebase/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pullRebase/expected/.git_keep/logs/HEAD b/test/integration/pullRebase/expected/.git_keep/logs/HEAD deleted file mode 100644 index f5bdda011..000000000 --- a/test/integration/pullRebase/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 c0ae07711df69fb0a21efaca9d63da42a67eaedf CI 1634896919 +1100 commit (initial): myfile1 -c0ae07711df69fb0a21efaca9d63da42a67eaedf 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 commit: myfile2 -0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 fe1d53ca86366f64f689586cb0fe243fed1d1482 CI 1634896919 +1100 commit: myfile3 -fe1d53ca86366f64f689586cb0fe243fed1d1482 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896919 +1100 commit: myfile4 -d0e04b2bced3bc76f0abf50698a7ab774cd54568 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 reset: moving to head^^ -0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 7b21277988b03a5fd9e933126e8d1f31d2498d08 CI 1634896919 +1100 commit: myfile5 -7b21277988b03a5fd9e933126e8d1f31d2498d08 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896920 +1100 pull --no-edit: checkout d0e04b2bced3bc76f0abf50698a7ab774cd54568 -d0e04b2bced3bc76f0abf50698a7ab774cd54568 74755f34462bd712c676b84247831233da97a272 CI 1634896920 +1100 pull --no-edit: myfile5 -74755f34462bd712c676b84247831233da97a272 74755f34462bd712c676b84247831233da97a272 CI 1634896920 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebase/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 564aa150d..000000000 --- a/test/integration/pullRebase/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 c0ae07711df69fb0a21efaca9d63da42a67eaedf CI 1634896919 +1100 commit (initial): myfile1 -c0ae07711df69fb0a21efaca9d63da42a67eaedf 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 commit: myfile2 -0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 fe1d53ca86366f64f689586cb0fe243fed1d1482 CI 1634896919 +1100 commit: myfile3 -fe1d53ca86366f64f689586cb0fe243fed1d1482 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896919 +1100 commit: myfile4 -d0e04b2bced3bc76f0abf50698a7ab774cd54568 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 reset: moving to head^^ -0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 7b21277988b03a5fd9e933126e8d1f31d2498d08 CI 1634896919 +1100 commit: myfile5 -7b21277988b03a5fd9e933126e8d1f31d2498d08 74755f34462bd712c676b84247831233da97a272 CI 1634896920 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebase/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index f04c3d5eb..000000000 --- a/test/integration/pullRebase/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896919 +1100 fetch origin: storing head diff --git a/test/integration/pullRebase/expected/.git_keep/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 b/test/integration/pullRebase/expected/.git_keep/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 deleted file mode 100644 index 53166135d..000000000 Binary files a/test/integration/pullRebase/expected/.git_keep/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 and /dev/null differ diff --git a/test/integration/pullRebase/expected/.git_keep/objects/74/755f34462bd712c676b84247831233da97a272 b/test/integration/pullRebase/expected/.git_keep/objects/74/755f34462bd712c676b84247831233da97a272 deleted file mode 100644 index 6cf095267..000000000 Binary files a/test/integration/pullRebase/expected/.git_keep/objects/74/755f34462bd712c676b84247831233da97a272 and /dev/null differ diff --git a/test/integration/pullRebase/expected/.git_keep/objects/7b/21277988b03a5fd9e933126e8d1f31d2498d08 b/test/integration/pullRebase/expected/.git_keep/objects/7b/21277988b03a5fd9e933126e8d1f31d2498d08 deleted file mode 100644 index 7557f1bec..000000000 --- a/test/integration/pullRebase/expected/.git_keep/objects/7b/21277988b03a5fd9e933126e8d1f31d2498d08 +++ /dev/null @@ -1,2 +0,0 @@ -xŽK -Â0@]çÙ 2“ɧ"BW=F&™`¡±¥DÐÛÛ#¸}</o­-]c´—~ˆèh²)E8”Tm!¨©Ö@­EÀµ§C^]3Ó`2»`"×bÄ×B‚Ń¡ @™)¸dUz÷çvèiÖã4?ä“Ú¾Ê-oí®Ñ“¢õõìƒ:é9ÕåO]µo]VqêB:þ \ No newline at end of file diff --git a/test/integration/pullRebase/expected/.git_keep/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf b/test/integration/pullRebase/expected/.git_keep/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf deleted file mode 100644 index bf8cba378..000000000 --- a/test/integration/pullRebase/expected/.git_keep/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJF§c¥®<ƘL¨à")´·×#tûyðS5[ ñ¥íªà•SñÂË5d"ÅÀ9`'XZ¨ÏLEÒ½sòi¯ºÃ4ÃcšGýŠ½7½¥jO@î)DŽáŠè½;ë9iú'wö+ë¦è6Õ,é \ No newline at end of file diff --git a/test/integration/pullRebase/expected/.git_keep/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 b/test/integration/pullRebase/expected/.git_keep/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 deleted file mode 100644 index 607a6325f..000000000 --- a/test/integration/pullRebase/expected/.git_keep/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -Â0@Q×9Eö‚d:“éD„®zŒ4Á‚±¥DÐÛÛ#¸ý¼Å/k­KóèÔvUßCO!”@(4s”Œ‘µçŽ0–¸-ïújÞæˆ% #³1KŠÂe -¦6a’Îåw{¬»FÆ»~rÝžz)k½y`$Iœ ù3@î¨ÇTÓ?¹«_[žJîåŸ8ö \ No newline at end of file diff --git a/test/integration/pullRebase/expected/.git_keep/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 b/test/integration/pullRebase/expected/.git_keep/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 deleted file mode 100644 index d16cbc927..000000000 Binary files a/test/integration/pullRebase/expected/.git_keep/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 and /dev/null differ diff --git a/test/integration/pullRebase/expected/.git_keep/refs/heads/master b/test/integration/pullRebase/expected/.git_keep/refs/heads/master deleted file mode 100644 index dcff007ea..000000000 --- a/test/integration/pullRebase/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -74755f34462bd712c676b84247831233da97a272 diff --git a/test/integration/pullRebase/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullRebase/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 5a2173631..000000000 --- a/test/integration/pullRebase/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -d0e04b2bced3bc76f0abf50698a7ab774cd54568 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/HEAD b/test/integration/pullRebase/expected/origin/HEAD similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/HEAD rename to test/integration/pullRebase/expected/origin/HEAD diff --git a/test/integration/pullRebase/expected/origin/config b/test/integration/pullRebase/expected/origin/config new file mode 100644 index 000000000..3b62fd0ac --- /dev/null +++ b/test/integration/pullRebase/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebase/actual/./repo diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/description b/test/integration/pullRebase/expected/origin/description similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/description rename to test/integration/pullRebase/expected/origin/description diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/info/exclude b/test/integration/pullRebase/expected/origin/info/exclude similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/info/exclude rename to test/integration/pullRebase/expected/origin/info/exclude diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebase/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullRebase/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullRebase/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullRebase/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d b/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d new file mode 100644 index 000000000..285b95bdd --- /dev/null +++ b/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙÊLœŽJ)¸ò1™PÁ!ERÐÛ×#tûyðS5[Ë¥mª€*©`”¹4df¥ 9Tzž¹ËÂ%¦»wñÛÞuƒq‚Ç8½töYõ–ª=„CǃGW"DwÖsÒôOîì(˪ä~1L,Ç \ No newline at end of file diff --git a/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 b/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 new file mode 100644 index 000000000..93ffd3015 Binary files /dev/null and b/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 b/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 new file mode 100644 index 000000000..48bff47be Binary files /dev/null and b/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 differ diff --git a/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a b/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a new file mode 100644 index 000000000..c6127ca4a Binary files /dev/null and b/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a differ diff --git a/test/integration/pullRebase/expected/origin/packed-refs b/test/integration/pullRebase/expected/origin/packed-refs new file mode 100644 index 000000000..2eebc50dc --- /dev/null +++ b/test/integration/pullRebase/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +f2b972db67c4667ac1896df3556a2cb2422bef8a refs/heads/master diff --git a/test/integration/pullRebase/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebase/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pullRebase/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pullRebase/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pullRebase/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebase/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..c1bf8040c --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +f2b972db67c4667ac1896df3556a2cb2422bef8a branch 'master' of ../origin diff --git a/test/integration/pullRebaseConflict/expected_remote/HEAD b/test/integration/pullRebase/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/HEAD rename to test/integration/pullRebase/expected/repo/.git_keep/HEAD diff --git a/test/integration/pullRebase/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebase/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..992a72681 --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +25b115c8ff09bf59b023af22277ea140b2833110 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/config b/test/integration/pullRebase/expected/repo/.git_keep/config similarity index 93% rename from test/integration/pullRebaseConflict/expected/.git_keep/config rename to test/integration/pullRebase/expected/repo/.git_keep/config index 1a54274ac..c85b6d3bb 100644 --- a/test/integration/pullRebaseConflict/expected/.git_keep/config +++ b/test/integration/pullRebase/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pullRebaseConflict/expected_remote/description b/test/integration/pullRebase/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/description rename to test/integration/pullRebase/expected/repo/.git_keep/description diff --git a/test/integration/pullRebase/expected/repo/.git_keep/index b/test/integration/pullRebase/expected/repo/.git_keep/index new file mode 100644 index 000000000..f694dd5ca Binary files /dev/null and b/test/integration/pullRebase/expected/repo/.git_keep/index differ diff --git a/test/integration/pullRebaseConflict/expected_remote/info/exclude b/test/integration/pullRebase/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/info/exclude rename to test/integration/pullRebase/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebase/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..db78f7c3e --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 7ba4176e37b24d5c97f17214ca6d658dbc58ef9d CI 1648349202 +1100 commit (initial): myfile1 +7ba4176e37b24d5c97f17214ca6d658dbc58ef9d 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349202 +1100 commit: myfile2 +84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 CI 1648349202 +1100 commit: myfile3 +f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 commit: myfile4 +f2b972db67c4667ac1896df3556a2cb2422bef8a 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349203 +1100 reset: moving to HEAD~2 +84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 25b115c8ff09bf59b023af22277ea140b2833110 CI 1648349203 +1100 commit: myfile5 +25b115c8ff09bf59b023af22277ea140b2833110 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349204 +1100 pull --no-edit: checkout f2b972db67c4667ac1896df3556a2cb2422bef8a +f2b972db67c4667ac1896df3556a2cb2422bef8a ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 pull --no-edit: myfile5 +ef833c09ff39663448dd9582e3d6ac1fa777fb4f ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..906b261f3 --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 7ba4176e37b24d5c97f17214ca6d658dbc58ef9d CI 1648349202 +1100 commit (initial): myfile1 +7ba4176e37b24d5c97f17214ca6d658dbc58ef9d 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349202 +1100 commit: myfile2 +84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 CI 1648349202 +1100 commit: myfile3 +f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 commit: myfile4 +f2b972db67c4667ac1896df3556a2cb2422bef8a 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349203 +1100 reset: moving to HEAD~2 +84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 25b115c8ff09bf59b023af22277ea140b2833110 CI 1648349203 +1100 commit: myfile5 +25b115c8ff09bf59b023af22277ea140b2833110 ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..ccc2918cc --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 b/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 new file mode 100644 index 000000000..38ec4954a Binary files /dev/null and b/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 differ diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebase/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullRebase/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullRebase/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullRebase/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d b/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d new file mode 100644 index 000000000..285b95bdd --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙÊLœŽJ)¸ò1™PÁ!ERÐÛ×#tûyðS5[Ë¥mª€*©`”¹4df¥ 9Tzž¹ËÂ%¦»wñÛÞuƒq‚Ç8½töYõ–ª=„CǃGW"DwÖsÒôOîì(˪ä~1L,Ç \ No newline at end of file diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 b/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 new file mode 100644 index 000000000..93ffd3015 Binary files /dev/null and b/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 differ diff --git a/test/integration/pullRebase/expected/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d b/test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d similarity index 100% rename from test/integration/pullRebase/expected/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d rename to test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d diff --git a/test/integration/pullRebase/expected/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 b/test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 similarity index 100% rename from test/integration/pullRebase/expected/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 rename to test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f b/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f new file mode 100644 index 000000000..1bcc7cca9 Binary files /dev/null and b/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 new file mode 100644 index 000000000..48bff47be Binary files /dev/null and b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a new file mode 100644 index 000000000..c6127ca4a Binary files /dev/null and b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebase/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..ca6b94f6e --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +ef833c09ff39663448dd9582e3d6ac1fa777fb4f diff --git a/test/integration/pullRebase/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebase/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..319df43c4 --- /dev/null +++ b/test/integration/pullRebase/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +f2b972db67c4667ac1896df3556a2cb2422bef8a diff --git a/test/integration/pullRebaseConflict/expected/myfile1 b/test/integration/pullRebase/expected/repo/myfile1 similarity index 100% rename from test/integration/pullRebaseConflict/expected/myfile1 rename to test/integration/pullRebase/expected/repo/myfile1 diff --git a/test/integration/pullRebaseConflict/expected/myfile2 b/test/integration/pullRebase/expected/repo/myfile2 similarity index 100% rename from test/integration/pullRebaseConflict/expected/myfile2 rename to test/integration/pullRebase/expected/repo/myfile2 diff --git a/test/integration/pullRebase/expected/myfile3 b/test/integration/pullRebase/expected/repo/myfile3 similarity index 100% rename from test/integration/pullRebase/expected/myfile3 rename to test/integration/pullRebase/expected/repo/myfile3 diff --git a/test/integration/pullRebase/expected/myfile4 b/test/integration/pullRebase/expected/repo/myfile4 similarity index 100% rename from test/integration/pullRebase/expected/myfile4 rename to test/integration/pullRebase/expected/repo/myfile4 diff --git a/test/integration/pullRebase/expected/myfile5 b/test/integration/pullRebase/expected/repo/myfile5 similarity index 100% rename from test/integration/pullRebase/expected/myfile5 rename to test/integration/pullRebase/expected/repo/myfile5 diff --git a/test/integration/pullRebase/expected_remote/config b/test/integration/pullRebase/expected_remote/config deleted file mode 100644 index 201a8b505..000000000 --- a/test/integration/pullRebase/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebase/./actual diff --git a/test/integration/pullRebase/expected_remote/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 b/test/integration/pullRebase/expected_remote/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 deleted file mode 100644 index 53166135d..000000000 Binary files a/test/integration/pullRebase/expected_remote/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 and /dev/null differ diff --git a/test/integration/pullRebase/expected_remote/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf b/test/integration/pullRebase/expected_remote/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf deleted file mode 100644 index bf8cba378..000000000 --- a/test/integration/pullRebase/expected_remote/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJF§c¥®<ƘL¨à")´·×#tûyðS5[ ñ¥íªà•SñÂË5d"ÅÀ9`'XZ¨ÏLEÒ½sòi¯ºÃ4ÃcšGýŠ½7½¥jO@î)DŽáŠè½;ë9iú'wö+ë¦è6Õ,é \ No newline at end of file diff --git a/test/integration/pullRebase/expected_remote/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 b/test/integration/pullRebase/expected_remote/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 deleted file mode 100644 index 607a6325f..000000000 --- a/test/integration/pullRebase/expected_remote/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -Â0@Q×9Eö‚d:“éD„®zŒ4Á‚±¥DÐÛÛ#¸ý¼Å/k­KóèÔvUßCO!”@(4s”Œ‘µçŽ0–¸-ïújÞæˆ% #³1KŠÂe -¦6a’Îåw{¬»FÆ»~rÝžz)k½y`$Iœ ù3@î¨ÇTÓ?¹«_[žJîåŸ8ö \ No newline at end of file diff --git a/test/integration/pullRebase/expected_remote/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 b/test/integration/pullRebase/expected_remote/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 deleted file mode 100644 index d16cbc927..000000000 Binary files a/test/integration/pullRebase/expected_remote/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 and /dev/null differ diff --git a/test/integration/pullRebase/expected_remote/packed-refs b/test/integration/pullRebase/expected_remote/packed-refs deleted file mode 100644 index 88b741528..000000000 --- a/test/integration/pullRebase/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -d0e04b2bced3bc76f0abf50698a7ab774cd54568 refs/heads/master diff --git a/test/integration/pullRebase/setup.sh b/test/integration/pullRebase/setup.sh index b1eb37fcf..affe8b273 100644 --- a/test/integration/pullRebase/setup.sh +++ b/test/integration/pullRebase/setup.sh @@ -25,9 +25,9 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo git reset --hard HEAD~2 @@ -35,7 +35,7 @@ echo test4 > myfile5 git add . git commit -am "myfile5" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebaseConflict/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 8f2963fe4..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -103c3eb899d173b83fc1b40261c8880fef359cc3 branch 'master' of ../actual_remote diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebaseConflict/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 4133994ce..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -116cef0e366265c3d002cdb3dce4e285e32b5d12 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/index b/test/integration/pullRebaseConflict/expected/.git_keep/index deleted file mode 100644 index 286197c14..000000000 Binary files a/test/integration/pullRebaseConflict/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/logs/HEAD b/test/integration/pullRebaseConflict/expected/.git_keep/logs/HEAD deleted file mode 100644 index 707a3154c..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 34574474ac6f7dd2d3142bc28ee39db88d8a16af CI 1634896923 +1100 commit (initial): myfile1 -34574474ac6f7dd2d3142bc28ee39db88d8a16af 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 commit: myfile2 -3b9389ff50095ad2d66d33bb6d67b5700f0bf6da aa6ae0785290ee09875f6bd5a5d50c0e7002de13 CI 1634896923 +1100 commit: myfile3 -aa6ae0785290ee09875f6bd5a5d50c0e7002de13 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896923 +1100 commit: myfile4 -103c3eb899d173b83fc1b40261c8880fef359cc3 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 reset: moving to head^^ -3b9389ff50095ad2d66d33bb6d67b5700f0bf6da 116cef0e366265c3d002cdb3dce4e285e32b5d12 CI 1634896923 +1100 commit: myfile4 conflict -116cef0e366265c3d002cdb3dce4e285e32b5d12 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896924 +1100 pull --no-edit: checkout 103c3eb899d173b83fc1b40261c8880fef359cc3 -103c3eb899d173b83fc1b40261c8880fef359cc3 db7122c7f62714dfa854d8d22b2081d308912af8 CI 1634896926 +1100 rebase: myfile4 conflict -db7122c7f62714dfa854d8d22b2081d308912af8 db7122c7f62714dfa854d8d22b2081d308912af8 CI 1634896926 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index eceafe30b..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 34574474ac6f7dd2d3142bc28ee39db88d8a16af CI 1634896923 +1100 commit (initial): myfile1 -34574474ac6f7dd2d3142bc28ee39db88d8a16af 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 commit: myfile2 -3b9389ff50095ad2d66d33bb6d67b5700f0bf6da aa6ae0785290ee09875f6bd5a5d50c0e7002de13 CI 1634896923 +1100 commit: myfile3 -aa6ae0785290ee09875f6bd5a5d50c0e7002de13 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896923 +1100 commit: myfile4 -103c3eb899d173b83fc1b40261c8880fef359cc3 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 reset: moving to head^^ -3b9389ff50095ad2d66d33bb6d67b5700f0bf6da 116cef0e366265c3d002cdb3dce4e285e32b5d12 CI 1634896923 +1100 commit: myfile4 conflict -116cef0e366265c3d002cdb3dce4e285e32b5d12 db7122c7f62714dfa854d8d22b2081d308912af8 CI 1634896926 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index f05f22244..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896923 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 deleted file mode 100644 index 54f9946f5..000000000 Binary files a/test/integration/pullRebaseConflict/expected/.git_keep/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/11/6cef0e366265c3d002cdb3dce4e285e32b5d12 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/11/6cef0e366265c3d002cdb3dce4e285e32b5d12 deleted file mode 100644 index 01f6c3182..000000000 Binary files a/test/integration/pullRebaseConflict/expected/.git_keep/objects/11/6cef0e366265c3d002cdb3dce4e285e32b5d12 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af b/test/integration/pullRebaseConflict/expected/.git_keep/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af deleted file mode 100644 index 229191e1c..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -à @Ñ®=Åì ÅÑéD¡”BV9†Ñ‘2X‚…äöͺý<ø¹©.øÒ7°Â¹ÚÄó%"ÁÀ% KXšÉ¦šòÝ™ôíï¶Á8Ácœ^²'ý¬rËMŸ€ì)DŽÎÃÑZsÖsÒåOnô¨Ë*h~5B,ß \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da b/test/integration/pullRebaseConflict/expected/.git_keep/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da deleted file mode 100644 index fd885765d..000000000 Binary files a/test/integration/pullRebaseConflict/expected/.git_keep/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 deleted file mode 100644 index 94a6241c8..000000000 Binary files a/test/integration/pullRebaseConflict/expected/.git_keep/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/db/7122c7f62714dfa854d8d22b2081d308912af8 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/db/7122c7f62714dfa854d8d22b2081d308912af8 deleted file mode 100644 index e8035ad35..000000000 Binary files a/test/integration/pullRebaseConflict/expected/.git_keep/objects/db/7122c7f62714dfa854d8d22b2081d308912af8 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/refs/heads/master b/test/integration/pullRebaseConflict/expected/.git_keep/refs/heads/master deleted file mode 100644 index ef35219b9..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -db7122c7f62714dfa854d8d22b2081d308912af8 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 271b00ad9..000000000 --- a/test/integration/pullRebaseConflict/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -103c3eb899d173b83fc1b40261c8880fef359cc3 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/HEAD b/test/integration/pullRebaseConflict/expected/origin/HEAD similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/HEAD rename to test/integration/pullRebaseConflict/expected/origin/HEAD diff --git a/test/integration/pullRebaseConflict/expected/origin/config b/test/integration/pullRebaseConflict/expected/origin/config new file mode 100644 index 000000000..22a73c314 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseConflict/actual/./repo diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/description b/test/integration/pullRebaseConflict/expected/origin/description similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/description rename to test/integration/pullRebaseConflict/expected/origin/description diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/info/exclude b/test/integration/pullRebaseConflict/expected/origin/info/exclude similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/info/exclude rename to test/integration/pullRebaseConflict/expected/origin/info/exclude diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b b/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b new file mode 100644 index 000000000..92dba726a --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙÊLœŽJ)¸ò1™PÁ!ERÐÛ×#tûyðS5[Ë¥mª€*©`”¹4df¥ 9Tzž¹ËÂ%¦»wñÛÞuƒq‚Ç8½töYõ–ª=„Cǃ÷W"DwÖsÒôOîì(˪ä~1P,Ç \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullRebaseConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 b/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 new file mode 100644 index 000000000..cf8b94a34 Binary files /dev/null and b/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 b/test/integration/pullRebaseConflict/expected/origin/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 new file mode 100644 index 000000000..04ef3447f Binary files /dev/null and b/test/integration/pullRebaseConflict/expected/origin/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullRebaseConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 b/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 new file mode 100644 index 000000000..8ebe82e5a Binary files /dev/null and b/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullRebaseConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullRebaseConflict/expected/origin/packed-refs b/test/integration/pullRebaseConflict/expected/origin/packed-refs new file mode 100644 index 000000000..edf7e7c39 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +702648e6efd5f8c60f5fe57e152850a5de756978 refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..d74d32218 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +702648e6efd5f8c60f5fe57e152850a5de756978 branch 'master' of ../origin diff --git a/test/integration/pullRebaseInteractive/expected_remote/HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/HEAD rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..c7f24c5a8 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +d450cc8f4e691e3043aac25ae71f0f1a3217368f diff --git a/test/integration/pullRebase/expected/.git_keep/config b/test/integration/pullRebaseConflict/expected/repo/.git_keep/config similarity index 93% rename from test/integration/pullRebase/expected/.git_keep/config rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/config index 1a54274ac..c85b6d3bb 100644 --- a/test/integration/pullRebase/expected/.git_keep/config +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pullRebaseInteractive/expected_remote/description b/test/integration/pullRebaseConflict/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/description rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/description diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/index b/test/integration/pullRebaseConflict/expected/repo/.git_keep/index new file mode 100644 index 000000000..ceeffd34e Binary files /dev/null and b/test/integration/pullRebaseConflict/expected/repo/.git_keep/index differ diff --git a/test/integration/pullRebaseInteractive/expected_remote/info/exclude b/test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/info/exclude rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..89cdca1d7 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b CI 1648349220 +1100 commit (initial): myfile1 +0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 commit: myfile2 +308a85a7f740d42925175560337196f952ac6cf6 ae0aa5a0d1c65005bd50012612b1c56c1ea06155 CI 1648349220 +1100 commit: myfile3 +ae0aa5a0d1c65005bd50012612b1c56c1ea06155 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 commit: myfile4 +702648e6efd5f8c60f5fe57e152850a5de756978 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 reset: moving to HEAD~2 +308a85a7f740d42925175560337196f952ac6cf6 d450cc8f4e691e3043aac25ae71f0f1a3217368f CI 1648349220 +1100 commit: myfile4 conflict +d450cc8f4e691e3043aac25ae71f0f1a3217368f 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349221 +1100 pull --no-edit: checkout 702648e6efd5f8c60f5fe57e152850a5de756978 +702648e6efd5f8c60f5fe57e152850a5de756978 bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase: myfile4 conflict +bdd975a23140e915dd46a1a16575c71bcad754ca bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..d538b98ff --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b CI 1648349220 +1100 commit (initial): myfile1 +0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 commit: myfile2 +308a85a7f740d42925175560337196f952ac6cf6 ae0aa5a0d1c65005bd50012612b1c56c1ea06155 CI 1648349220 +1100 commit: myfile3 +ae0aa5a0d1c65005bd50012612b1c56c1ea06155 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 commit: myfile4 +702648e6efd5f8c60f5fe57e152850a5de756978 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 reset: moving to HEAD~2 +308a85a7f740d42925175560337196f952ac6cf6 d450cc8f4e691e3043aac25ae71f0f1a3217368f CI 1648349220 +1100 commit: myfile4 conflict +d450cc8f4e691e3043aac25ae71f0f1a3217368f bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..db9c9657f --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b new file mode 100644 index 000000000..92dba726a --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙÊLœŽJ)¸ò1™PÁ!ERÐÛ×#tûyðS5[Ë¥mª€*©`”¹4df¥ 9Tzž¹ËÂ%¦»wñÛÞuƒq‚Ç8½töYõ–ª=„Cǃ÷W"DwÖsÒôOîì(˪ä~1P,Ç \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullRebaseConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 new file mode 100644 index 000000000..cf8b94a34 Binary files /dev/null and b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 new file mode 100644 index 000000000..04ef3447f Binary files /dev/null and b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 new file mode 100644 index 000000000..8ebe82e5a Binary files /dev/null and b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 differ diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca new file mode 100644 index 000000000..32a1c9b2a --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca @@ -0,0 +1,3 @@ +x…ŽË +Â0E]ç+²dò˜<@D誟1&,4M)ôïͽÛÃáÜ›Z­K—Ì©Ìò¡3™ì’ +€¢ 6jë)gï3DbgQ‰Þºô  ì¸d,!9(X=+Ô0³G}ôêÏvÈi–×i¾ó›ê¾ò%µz“jÌXÑ ÏJˆAÇ©ÎtóÓEý”ee+SÛʺ¤.¾‘= \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f new file mode 100644 index 000000000..2850a992e --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f @@ -0,0 +1,2 @@ +xÎA +ƒ0@Ñ®sŠì e&™L ”Rpå1Æ1¡‚Q‘ÚÛ×#tûy‹¯[­s³ü¥9[É+ SŒ€]™JHJHEb³Ë‘×f=œ*H,‘`"—\Àƒ÷—œ(ka#ïöÚÛöÞÏü‘º/ù¦[}Xdê<%çÀ^ÌYÏ©–ÿä¦~˼d²º­e™µ™=W<[ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d similarity index 100% rename from test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d rename to test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..19ea48024 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +bdd975a23140e915dd46a1a16575c71bcad754ca diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..af3d6e11d --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +702648e6efd5f8c60f5fe57e152850a5de756978 diff --git a/test/integration/pullRebaseInteractive/expected/myfile1 b/test/integration/pullRebaseConflict/expected/repo/myfile1 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/myfile1 rename to test/integration/pullRebaseConflict/expected/repo/myfile1 diff --git a/test/integration/pullRebaseInteractive/expected/myfile2 b/test/integration/pullRebaseConflict/expected/repo/myfile2 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/myfile2 rename to test/integration/pullRebaseConflict/expected/repo/myfile2 diff --git a/test/integration/pullRebaseConflict/expected/myfile3 b/test/integration/pullRebaseConflict/expected/repo/myfile3 similarity index 100% rename from test/integration/pullRebaseConflict/expected/myfile3 rename to test/integration/pullRebaseConflict/expected/repo/myfile3 diff --git a/test/integration/pullRebaseConflict/expected/myfile4 b/test/integration/pullRebaseConflict/expected/repo/myfile4 similarity index 100% rename from test/integration/pullRebaseConflict/expected/myfile4 rename to test/integration/pullRebaseConflict/expected/repo/myfile4 diff --git a/test/integration/pullRebaseConflict/expected_remote/config b/test/integration/pullRebaseConflict/expected_remote/config deleted file mode 100644 index e2f03fd10..000000000 --- a/test/integration/pullRebaseConflict/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseConflict/./actual diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 b/test/integration/pullRebaseConflict/expected_remote/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 deleted file mode 100644 index 54f9946f5..000000000 Binary files a/test/integration/pullRebaseConflict/expected_remote/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af b/test/integration/pullRebaseConflict/expected_remote/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af deleted file mode 100644 index 229191e1c..000000000 --- a/test/integration/pullRebaseConflict/expected_remote/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -à @Ñ®=Åì ÅÑéD¡”BV9†Ñ‘2X‚…äöͺý<ø¹©.øÒ7°Â¹ÚÄó%"ÁÀ% KXšÉ¦šòÝ™ôíï¶Á8Ácœ^²'ý¬rËMŸ€ì)DŽÎÃÑZsÖsÒåOnô¨Ë*h~5B,ß \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da b/test/integration/pullRebaseConflict/expected_remote/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da deleted file mode 100644 index fd885765d..000000000 Binary files a/test/integration/pullRebaseConflict/expected_remote/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 b/test/integration/pullRebaseConflict/expected_remote/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 deleted file mode 100644 index 94a6241c8..000000000 Binary files a/test/integration/pullRebaseConflict/expected_remote/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected_remote/packed-refs b/test/integration/pullRebaseConflict/expected_remote/packed-refs deleted file mode 100644 index 5fc546218..000000000 --- a/test/integration/pullRebaseConflict/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -103c3eb899d173b83fc1b40261c8880fef359cc3 refs/heads/master diff --git a/test/integration/pullRebaseConflict/setup.sh b/test/integration/pullRebaseConflict/setup.sh index e02be3c0c..7360923fe 100644 --- a/test/integration/pullRebaseConflict/setup.sh +++ b/test/integration/pullRebaseConflict/setup.sh @@ -25,9 +25,9 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo git reset --hard HEAD~2 @@ -35,7 +35,7 @@ echo conflict > myfile4 git add . git commit -am "myfile4 conflict" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractive/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 5d2dc1af4..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -ea4a99ea801f54f1ec09a88a28c65eb4db5865aa branch 'master' of ../actual_remote diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractive/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index a03bb270d..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -efbb36c97316886b089b1b27233cd8bfdc37ed4a diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/index b/test/integration/pullRebaseInteractive/expected/.git_keep/index deleted file mode 100644 index 906076536..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/HEAD b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/HEAD deleted file mode 100644 index ea2e57777..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,15 +0,0 @@ -0000000000000000000000000000000000000000 74ca3dec707dde7c92727d9490517e498360fea8 CI 1634896929 +1100 commit (initial): myfile1 -74ca3dec707dde7c92727d9490517e498360fea8 ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 commit: myfile2 -ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 3fb33027aedae13ab0796292c821a0258f6c2f7b CI 1634896929 +1100 commit: myfile3 -3fb33027aedae13ab0796292c821a0258f6c2f7b ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896929 +1100 commit: myfile4 -ea4a99ea801f54f1ec09a88a28c65eb4db5865aa ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 reset: moving to head^^ -ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 efbb36c97316886b089b1b27233cd8bfdc37ed4a CI 1634896929 +1100 commit: myfile4 conflict -efbb36c97316886b089b1b27233cd8bfdc37ed4a 9147ce4817b84339d884cee1683f361fd3aa4696 CI 1634896929 +1100 commit: 5 -9147ce4817b84339d884cee1683f361fd3aa4696 e2251a5b6d32bf5fc57f234946e3fabeba3b5cca CI 1634896929 +1100 commit: 6 -e2251a5b6d32bf5fc57f234946e3fabeba3b5cca 89ee54b2ed7aff7c3aae24f64be85568f9a9d329 CI 1634896929 +1100 commit: 7 -89ee54b2ed7aff7c3aae24f64be85568f9a9d329 ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896931 +1100 rebase -i (start): checkout ea4a99ea801f54f1ec09a88a28c65eb4db5865aa -ea4a99ea801f54f1ec09a88a28c65eb4db5865aa 29daf999882c9e60c6b6a2868913a6cfd856d620 CI 1634896933 +1100 rebase -i (continue): myfile4 conflict -29daf999882c9e60c6b6a2868913a6cfd856d620 5c32741b468f0ab8ddd243e9871dcc8dec5c35f9 CI 1634896933 +1100 rebase -i (pick): 5 -5c32741b468f0ab8ddd243e9871dcc8dec5c35f9 423f7757eb2eea3de217b54447a94820af933d3a CI 1634896933 +1100 rebase -i (pick): 6 -423f7757eb2eea3de217b54447a94820af933d3a bf4fb489636d4bde42e478b04cbdcc079dcd0183 CI 1634896933 +1100 rebase -i (pick): 7 -bf4fb489636d4bde42e478b04cbdcc079dcd0183 bf4fb489636d4bde42e478b04cbdcc079dcd0183 CI 1634896933 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 6ebd29d80..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 74ca3dec707dde7c92727d9490517e498360fea8 CI 1634896929 +1100 commit (initial): myfile1 -74ca3dec707dde7c92727d9490517e498360fea8 ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 commit: myfile2 -ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 3fb33027aedae13ab0796292c821a0258f6c2f7b CI 1634896929 +1100 commit: myfile3 -3fb33027aedae13ab0796292c821a0258f6c2f7b ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896929 +1100 commit: myfile4 -ea4a99ea801f54f1ec09a88a28c65eb4db5865aa ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 reset: moving to head^^ -ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 efbb36c97316886b089b1b27233cd8bfdc37ed4a CI 1634896929 +1100 commit: myfile4 conflict -efbb36c97316886b089b1b27233cd8bfdc37ed4a 9147ce4817b84339d884cee1683f361fd3aa4696 CI 1634896929 +1100 commit: 5 -9147ce4817b84339d884cee1683f361fd3aa4696 e2251a5b6d32bf5fc57f234946e3fabeba3b5cca CI 1634896929 +1100 commit: 6 -e2251a5b6d32bf5fc57f234946e3fabeba3b5cca 89ee54b2ed7aff7c3aae24f64be85568f9a9d329 CI 1634896929 +1100 commit: 7 -89ee54b2ed7aff7c3aae24f64be85568f9a9d329 bf4fb489636d4bde42e478b04cbdcc079dcd0183 CI 1634896933 +1100 rebase -i (finish): refs/heads/master onto ea4a99ea801f54f1ec09a88a28c65eb4db5865aa diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 4a22e7de9..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896929 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/29/daf999882c9e60c6b6a2868913a6cfd856d620 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/29/daf999882c9e60c6b6a2868913a6cfd856d620 deleted file mode 100644 index 59ed7fe6b..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/29/daf999882c9e60c6b6a2868913a6cfd856d620 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b deleted file mode 100644 index 72f6e886b..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/42/3f7757eb2eea3de217b54447a94820af933d3a b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/42/3f7757eb2eea3de217b54447a94820af933d3a deleted file mode 100644 index a0d83ec6c..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/42/3f7757eb2eea3de217b54447a94820af933d3a +++ /dev/null @@ -1,5 +0,0 @@ -x}ÎA -1 …a×=E÷‚4MÛI@D˜Õ£6) -Ö† -ß.\»}|ðþ²¶öèˆ}Wµ>x ˆ•âä2áJ…˜A*8!:ÌÊl¶¼ë«ÛXÐOn!QuùF"â*ÓR -‰–!be“ßý¾îv^ìy^®úÉm{ꩬíb!a NìÙaܘ±Ž¨®ÿ9â›d¾-¥7• \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/5c/32741b468f0ab8ddd243e9871dcc8dec5c35f9 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/5c/32741b468f0ab8ddd243e9871dcc8dec5c35f9 deleted file mode 100644 index 3bc24fb42..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/5c/32741b468f0ab8ddd243e9871dcc8dec5c35f9 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/74/ca3dec707dde7c92727d9490517e498360fea8 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/74/ca3dec707dde7c92727d9490517e498360fea8 deleted file mode 100644 index 2f5e7e39f..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/74/ca3dec707dde7c92727d9490517e498360fea8 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -Â0@Q×9Åìɤã4¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð2&…H1r‰ëH …©J¾'ïþl;L3ܦù¡±×¦—ÜìÈÅÄ)$8#zïŽzLºþÉ}ëº)º7(,ë \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/89/ee54b2ed7aff7c3aae24f64be85568f9a9d329 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/89/ee54b2ed7aff7c3aae24f64be85568f9a9d329 deleted file mode 100644 index 155cfe5f6..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/89/ee54b2ed7aff7c3aae24f64be85568f9a9d329 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/91/47ce4817b84339d884cee1683f361fd3aa4696 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/91/47ce4817b84339d884cee1683f361fd3aa4696 deleted file mode 100644 index 04880639a..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/91/47ce4817b84339d884cee1683f361fd3aa4696 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b8/9e837219d9a8aceb8b0f13381be0afb0dac427 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b8/9e837219d9a8aceb8b0f13381be0afb0dac427 deleted file mode 100644 index 3d41eceda..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b8/9e837219d9a8aceb8b0f13381be0afb0dac427 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/bf/4fb489636d4bde42e478b04cbdcc079dcd0183 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/bf/4fb489636d4bde42e478b04cbdcc079dcd0183 deleted file mode 100644 index 11a65f3f4..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/bf/4fb489636d4bde42e478b04cbdcc079dcd0183 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 deleted file mode 100644 index 1cf77f0bb..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/e2/251a5b6d32bf5fc57f234946e3fabeba3b5cca b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/e2/251a5b6d32bf5fc57f234946e3fabeba3b5cca deleted file mode 100644 index f4473469b..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/e2/251a5b6d32bf5fc57f234946e3fabeba3b5cca and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa deleted file mode 100644 index a9ed03844..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚df’I"BW=Æ4N°ÐØR"èííÜ~Þâ—µµ¹[ÈþÔwU‹•!z%ç)Uð0‡$X#£§P$d0›ìúê–êDä0Š>Ddr13f, A†T¹`“‘w®»F{Æ»~¤m‹^ÊÚn˜|Êœ1Û3€sæ¨ÇT×?¹iß:/êÍÓg8Õ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ef/bb36c97316886b089b1b27233cd8bfdc37ed4a b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ef/bb36c97316886b089b1b27233cd8bfdc37ed4a deleted file mode 100644 index 2f6153345..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ef/bb36c97316886b089b1b27233cd8bfdc37ed4a +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚̤ɘ€ˆÐU1™N°Ð˜R"èííÜ>þâK«uéÖÁp껪eI€Pä˜ gÀ2ù’xô³¿z2ïúêV8DÍ„©”L.Ì pv9C,…Ü`øÝŸm·ãdoãôÐ×mÕ‹´z·Hƒ‰’KöŒ`=¦ºþ™›ú-˪ÞJ{•u‘n~/æ>@ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractive/expected/.git_keep/refs/heads/master deleted file mode 100644 index bc528dc20..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -bf4fb489636d4bde42e478b04cbdcc079dcd0183 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 0597374d4..000000000 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -ea4a99ea801f54f1ec09a88a28c65eb4db5865aa diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/HEAD b/test/integration/pullRebaseInteractive/expected/origin/HEAD similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/HEAD rename to test/integration/pullRebaseInteractive/expected/origin/HEAD diff --git a/test/integration/pullRebaseInteractive/expected/origin/config b/test/integration/pullRebaseInteractive/expected/origin/config new file mode 100644 index 000000000..c10372133 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractive/actual/./repo diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/description b/test/integration/pullRebaseInteractive/expected/origin/description similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/description rename to test/integration/pullRebaseInteractive/expected/origin/description diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/info/exclude b/test/integration/pullRebaseInteractive/expected/origin/info/exclude similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/info/exclude rename to test/integration/pullRebaseInteractive/expected/origin/info/exclude diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractive/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullRebaseInteractive/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 b/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 new file mode 100644 index 000000000..41731f660 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 b/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 new file mode 100644 index 000000000..bf8c283f0 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 @@ -0,0 +1,3 @@ +xÍA +ƒ0@Ñ®sŠÙJ&Žc„R +®<ƘL¨à‘ÚÛ×#tûyðS5[ ñ¥ªà•SñÂË0jÌDŠ‘sÄ XZ¨ËLERœ¼Û«0ÍpŸæ§~ÄöMo©Ú)v4êáŠè½;ë9iú'wö-ë¦è~3‹,Õ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca b/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca new file mode 100644 index 000000000..d3ebd3660 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseInteractive/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullRebaseInteractive/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 b/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 new file mode 100644 index 000000000..8d51321bd --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 @@ -0,0 +1,3 @@ +xÎA +Â0@Q×9Eö‚Ìd&ÓD„®zŒd:Å‚±¥DÐÛÛ#¸ý¼Å×µÖ¥yìùÔv3fÁŽ!%`J3rA‘˜2E±NSÔ{t[ÞíÕ|S  ɤ“h`JIдäZ +™4»ünu÷Ãè¯Ãx·O®ÛÓ.ºÖ›GáDÜŽþŒàŽzL5û“»ú—§±ûüJ9? \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullRebaseInteractive/expected/origin/packed-refs b/test/integration/pullRebaseInteractive/expected/origin/packed-refs new file mode 100644 index 000000000..6060b6bc3 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +d43a810e4d47f2c632ea62ae581a8aade6f23b21 refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 61% rename from test/integration/pullRebaseInteractive/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG index 12f245db0..f09f5548b 100644 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG @@ -3,13 +3,13 @@ myfile4 conflict # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# interactive rebase in progress; onto ea4a99e +# interactive rebase in progress; onto d43a810 # Last command done (1 command done): -# pick efbb36c myfile4 conflict +# pick e974f4a myfile4 conflict # Next commands to do (3 remaining commands): -# pick 9147ce4 5 -# pick e2251a5 6 -# You are currently rebasing branch 'master' on 'ea4a99e'. +# pick d217625 5 +# pick 09f87d1 6 +# You are currently rebasing branch 'master' on 'd43a810'. # # Changes to be committed: # modified: myfile4 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..5b1cee8fc --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +d43a810e4d47f2c632ea62ae581a8aade6f23b21 branch 'master' of ../origin diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/HEAD rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..3bcbef789 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +e974f4acf07db6fcaa438df552a8fd44e2d58dcd diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/config b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config similarity index 93% rename from test/integration/pullRebaseInteractive/expected/.git_keep/config rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/config index cfff6ba8c..6dc2c0ed8 100644 --- a/test/integration/pullRebaseInteractive/expected/.git_keep/config +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/description b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/description rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/description diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index new file mode 100644 index 000000000..531e6a734 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/info/exclude b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/info/exclude rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..610710e3e --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,15 @@ +0000000000000000000000000000000000000000 7c0506ec2cd7852818e3e597619ff64af83770c6 CI 1648349245 +1100 commit (initial): myfile1 +7c0506ec2cd7852818e3e597619ff64af83770c6 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 commit: myfile2 +52137603da2dccb618dfa0953d1b7df8c0255959 91d2303b08e6765e0ec38c401ecbab0cbb126dca CI 1648349245 +1100 commit: myfile3 +91d2303b08e6765e0ec38c401ecbab0cbb126dca d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 commit: myfile4 +d43a810e4d47f2c632ea62ae581a8aade6f23b21 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 reset: moving to HEAD~2 +52137603da2dccb618dfa0953d1b7df8c0255959 e974f4acf07db6fcaa438df552a8fd44e2d58dcd CI 1648349245 +1100 commit: myfile4 conflict +e974f4acf07db6fcaa438df552a8fd44e2d58dcd d217625c37713436bb6c92ff9d0b3991a8a7dba5 CI 1648349245 +1100 commit: 5 +d217625c37713436bb6c92ff9d0b3991a8a7dba5 09f87d11c514ba0a54e43193aaf9067174e2315e CI 1648349245 +1100 commit: 6 +09f87d11c514ba0a54e43193aaf9067174e2315e 2e0409bb60df3c4587245fd01fdeb270bb5a24f3 CI 1648349245 +1100 commit: 7 +2e0409bb60df3c4587245fd01fdeb270bb5a24f3 d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349247 +1100 rebase -i (start): checkout d43a810e4d47f2c632ea62ae581a8aade6f23b21 +d43a810e4d47f2c632ea62ae581a8aade6f23b21 66d3639353f039f2b87ea3e0dd3db13a5415c6df CI 1648349249 +1100 rebase -i (continue): myfile4 conflict +66d3639353f039f2b87ea3e0dd3db13a5415c6df 5c4dd6c94fae2afe48f413f48dc998ae48fcf463 CI 1648349249 +1100 rebase -i (pick): 5 +5c4dd6c94fae2afe48f413f48dc998ae48fcf463 ff0d57cafe9d745264b23450e9268cdb5ddc4edc CI 1648349249 +1100 rebase -i (pick): 6 +ff0d57cafe9d745264b23450e9268cdb5ddc4edc 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (pick): 7 +416178fd7462af72f4357dda1241fc66063e467b 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..8f16c1e9c --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 7c0506ec2cd7852818e3e597619ff64af83770c6 CI 1648349245 +1100 commit (initial): myfile1 +7c0506ec2cd7852818e3e597619ff64af83770c6 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 commit: myfile2 +52137603da2dccb618dfa0953d1b7df8c0255959 91d2303b08e6765e0ec38c401ecbab0cbb126dca CI 1648349245 +1100 commit: myfile3 +91d2303b08e6765e0ec38c401ecbab0cbb126dca d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 commit: myfile4 +d43a810e4d47f2c632ea62ae581a8aade6f23b21 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 reset: moving to HEAD~2 +52137603da2dccb618dfa0953d1b7df8c0255959 e974f4acf07db6fcaa438df552a8fd44e2d58dcd CI 1648349245 +1100 commit: myfile4 conflict +e974f4acf07db6fcaa438df552a8fd44e2d58dcd d217625c37713436bb6c92ff9d0b3991a8a7dba5 CI 1648349245 +1100 commit: 5 +d217625c37713436bb6c92ff9d0b3991a8a7dba5 09f87d11c514ba0a54e43193aaf9067174e2315e CI 1648349245 +1100 commit: 6 +09f87d11c514ba0a54e43193aaf9067174e2315e 2e0409bb60df3c4587245fd01fdeb270bb5a24f3 CI 1648349245 +1100 commit: 7 +2e0409bb60df3c4587245fd01fdeb270bb5a24f3 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (finish): refs/heads/master onto d43a810e4d47f2c632ea62ae581a8aade6f23b21 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..fdad392f4 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb new file mode 100644 index 000000000..ce54059d4 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/09/f87d11c514ba0a54e43193aaf9067174e2315e b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/09/f87d11c514ba0a54e43193aaf9067174e2315e new file mode 100644 index 000000000..c3702e14a Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/09/f87d11c514ba0a54e43193aaf9067174e2315e differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 new file mode 100644 index 000000000..1d9689812 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 differ diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullRebaseInteractive/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b new file mode 100644 index 000000000..3744a685d Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 new file mode 100644 index 000000000..41731f660 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 new file mode 100644 index 000000000..053e1cb24 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 @@ -0,0 +1,2 @@ +x…Î1 +1@Qëœ"½ “L&N@DØj1I&(wY"x|·°·ý¼â—¥÷Ç°Žù06UÛ g%/ä™1B’R3{*, }KÉálVÙô5lŒ#&$l€©ùÌgT¨kv(•X›‘÷¸/›f{™æ›~¤¯O=•¥_­‹1$È0{ݧ†þáéÇ ™/¨Ù8 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df new file mode 100644 index 000000000..534bfc387 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 new file mode 100644 index 000000000..bf8c283f0 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 @@ -0,0 +1,3 @@ +xÍA +ƒ0@Ñ®sŠÙJ&Žc„R +®<ƘL¨à‘ÚÛ×#tûyðS5[ ñ¥ªà•SñÂË0jÌDŠ‘sÄ XZ¨ËLERœ¼Û«0ÍpŸæ§~ÄöMo©Ú)v4êáŠè½;ë9iú'wö-ë¦è~3‹,Õ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca new file mode 100644 index 000000000..d3ebd3660 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 new file mode 100644 index 000000000..96116a717 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 new file mode 100644 index 000000000..8d51321bd --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 @@ -0,0 +1,3 @@ +xÎA +Â0@Q×9Eö‚Ìd&ÓD„®zŒd:Å‚±¥DÐÛÛ#¸ý¼Å×µÖ¥yìùÔv3fÁŽ!%`J3rA‘˜2E±NSÔ{t[ÞíÕ|S  ɤ“h`JIдäZ +™4»ünu÷Ãè¯Ãx·O®ÛÓ.ºÖ›GáDÜŽþŒàŽzL5û“»ú—§±ûüJ9? \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd new file mode 100644 index 000000000..dc8909137 Binary files /dev/null and b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd differ diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 rename to test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc new file mode 100644 index 000000000..e278bfbe8 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc @@ -0,0 +1,2 @@ +x…ŽA +1 E]÷Ý Ò´iM@D˜•Çm‚‚u†¡‚Çw÷.ßçÁuîý><íƪê#F ÈFù$ac£JÌÐ Bȃ¶$ÊìYõ9|®ØZ©Œ&ÅÉ’!µÊLòåjX’“׸ͫŸ®þ4]/ú–¾<ôPç~öPrÄì÷°Ý¸mÝ¢†þÑù§»â>jñ7ù \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..99eb1dca1 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +416178fd7462af72f4357dda1241fc66063e467b diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..6a52d4f85 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +d43a810e4d47f2c632ea62ae581a8aade6f23b21 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile1 b/test/integration/pullRebaseInteractive/expected/repo/myfile1 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/myfile1 rename to test/integration/pullRebaseInteractive/expected/repo/myfile1 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile2 b/test/integration/pullRebaseInteractive/expected/repo/myfile2 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/myfile2 rename to test/integration/pullRebaseInteractive/expected/repo/myfile2 diff --git a/test/integration/pullRebaseInteractive/expected/myfile3 b/test/integration/pullRebaseInteractive/expected/repo/myfile3 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/myfile3 rename to test/integration/pullRebaseInteractive/expected/repo/myfile3 diff --git a/test/integration/pullRebaseInteractive/expected/myfile4 b/test/integration/pullRebaseInteractive/expected/repo/myfile4 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/myfile4 rename to test/integration/pullRebaseInteractive/expected/repo/myfile4 diff --git a/test/integration/pullRebaseInteractive/expected/myfile5 b/test/integration/pullRebaseInteractive/expected/repo/myfile5 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/myfile5 rename to test/integration/pullRebaseInteractive/expected/repo/myfile5 diff --git a/test/integration/pullRebaseInteractive/expected/myfile6 b/test/integration/pullRebaseInteractive/expected/repo/myfile6 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/myfile6 rename to test/integration/pullRebaseInteractive/expected/repo/myfile6 diff --git a/test/integration/pullRebaseInteractive/expected/myfile7 b/test/integration/pullRebaseInteractive/expected/repo/myfile7 similarity index 100% rename from test/integration/pullRebaseInteractive/expected/myfile7 rename to test/integration/pullRebaseInteractive/expected/repo/myfile7 diff --git a/test/integration/pullRebaseInteractive/expected_remote/config b/test/integration/pullRebaseInteractive/expected_remote/config deleted file mode 100644 index 79d424485..000000000 --- a/test/integration/pullRebaseInteractive/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractive/./actual diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b b/test/integration/pullRebaseInteractive/expected_remote/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b deleted file mode 100644 index 72f6e886b..000000000 Binary files a/test/integration/pullRebaseInteractive/expected_remote/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/74/ca3dec707dde7c92727d9490517e498360fea8 b/test/integration/pullRebaseInteractive/expected_remote/objects/74/ca3dec707dde7c92727d9490517e498360fea8 deleted file mode 100644 index 2f5e7e39f..000000000 --- a/test/integration/pullRebaseInteractive/expected_remote/objects/74/ca3dec707dde7c92727d9490517e498360fea8 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -Â0@Q×9Åìɤã4¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð2&…H1r‰ëH …©J¾'ïþl;L3ܦù¡±×¦—ÜìÈÅÄ)$8#zïŽzLºþÉ}ëº)º7(,ë \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 b/test/integration/pullRebaseInteractive/expected_remote/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 deleted file mode 100644 index 1cf77f0bb..000000000 Binary files a/test/integration/pullRebaseInteractive/expected_remote/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa b/test/integration/pullRebaseInteractive/expected_remote/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa deleted file mode 100644 index a9ed03844..000000000 --- a/test/integration/pullRebaseInteractive/expected_remote/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚df’I"BW=Æ4N°ÐØR"èííÜ~Þâ—µµ¹[ÈþÔwU‹•!z%ç)Uð0‡$X#£§P$d0›ìúê–êDä0Š>Ddr13f, A†T¹`“‘w®»F{Æ»~¤m‹^ÊÚn˜|Êœ1Û3€sæ¨ÇT×?¹iß:/êÍÓg8Õ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected_remote/packed-refs b/test/integration/pullRebaseInteractive/expected_remote/packed-refs deleted file mode 100644 index 33ecbd263..000000000 --- a/test/integration/pullRebaseInteractive/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -ea4a99ea801f54f1ec09a88a28c65eb4db5865aa refs/heads/master diff --git a/test/integration/pullRebaseInteractive/setup.sh b/test/integration/pullRebaseInteractive/setup.sh index a0dce709f..fc90cd285 100644 --- a/test/integration/pullRebaseInteractive/setup.sh +++ b/test/integration/pullRebaseInteractive/setup.sh @@ -25,9 +25,9 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo git reset --hard HEAD~2 @@ -47,7 +47,7 @@ echo test > myfile7 git add . git commit -am "7" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 4d6186494..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -4589efcaf3024e841825bb289bb88eb0e4f8530a branch 'master' of ../actual_remote diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index d989f6dc2..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -9013b5f12ca8a0fdd44fbe72028500bbac5c89ee diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/index b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/index deleted file mode 100644 index 109dfab63..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/HEAD deleted file mode 100644 index f5f276231..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,14 +0,0 @@ -0000000000000000000000000000000000000000 5759b6258419271e67a172e51cd90048dd21f9c0 CI 1634896936 +1100 commit (initial): myfile1 -5759b6258419271e67a172e51cd90048dd21f9c0 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 commit: myfile2 -476a1939075b60aa47da50a8c40c5b4412a2f18b e047462bda495acbe565c85b205d614f38c0a692 CI 1634896936 +1100 commit: myfile3 -e047462bda495acbe565c85b205d614f38c0a692 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896936 +1100 commit: myfile4 -4589efcaf3024e841825bb289bb88eb0e4f8530a 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 reset: moving to head^^ -476a1939075b60aa47da50a8c40c5b4412a2f18b 9013b5f12ca8a0fdd44fbe72028500bbac5c89ee CI 1634896936 +1100 commit: myfile4 conflict -9013b5f12ca8a0fdd44fbe72028500bbac5c89ee 0fa53867500c0f3a5cca9b2112982795fae51c51 CI 1634896936 +1100 commit: 5 -0fa53867500c0f3a5cca9b2112982795fae51c51 69a5c9fb912112305bfe15272855afb50f6acf4b CI 1634896936 +1100 commit: 6 -69a5c9fb912112305bfe15272855afb50f6acf4b af4c4b2b977f8909e590ea5bc3bab59d991e4c28 CI 1634896936 +1100 commit: 7 -af4c4b2b977f8909e590ea5bc3bab59d991e4c28 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896938 +1100 rebase -i (start): checkout 4589efcaf3024e841825bb289bb88eb0e4f8530a -4589efcaf3024e841825bb289bb88eb0e4f8530a 5d08d9b6315ddb8fb8372d83b54862ba7d7fdc88 CI 1634896942 +1100 rebase -i (continue): myfile4 conflict -5d08d9b6315ddb8fb8372d83b54862ba7d7fdc88 7c717449332e4a81f7e5643eef9c95f459444e3f CI 1634896942 +1100 rebase -i (pick): 5 -7c717449332e4a81f7e5643eef9c95f459444e3f ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI 1634896942 +1100 rebase -i (pick): 7 -ae4e33d43751b83fbd0b6f0a1796d58462492e47 ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI 1634896942 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index ae47bc191..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 5759b6258419271e67a172e51cd90048dd21f9c0 CI 1634896936 +1100 commit (initial): myfile1 -5759b6258419271e67a172e51cd90048dd21f9c0 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 commit: myfile2 -476a1939075b60aa47da50a8c40c5b4412a2f18b e047462bda495acbe565c85b205d614f38c0a692 CI 1634896936 +1100 commit: myfile3 -e047462bda495acbe565c85b205d614f38c0a692 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896936 +1100 commit: myfile4 -4589efcaf3024e841825bb289bb88eb0e4f8530a 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 reset: moving to head^^ -476a1939075b60aa47da50a8c40c5b4412a2f18b 9013b5f12ca8a0fdd44fbe72028500bbac5c89ee CI 1634896936 +1100 commit: myfile4 conflict -9013b5f12ca8a0fdd44fbe72028500bbac5c89ee 0fa53867500c0f3a5cca9b2112982795fae51c51 CI 1634896936 +1100 commit: 5 -0fa53867500c0f3a5cca9b2112982795fae51c51 69a5c9fb912112305bfe15272855afb50f6acf4b CI 1634896936 +1100 commit: 6 -69a5c9fb912112305bfe15272855afb50f6acf4b af4c4b2b977f8909e590ea5bc3bab59d991e4c28 CI 1634896936 +1100 commit: 7 -af4c4b2b977f8909e590ea5bc3bab59d991e4c28 ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI 1634896942 +1100 rebase -i (finish): refs/heads/master onto 4589efcaf3024e841825bb289bb88eb0e4f8530a diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 3c26173a8..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896936 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0f/a53867500c0f3a5cca9b2112982795fae51c51 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0f/a53867500c0f3a5cca9b2112982795fae51c51 deleted file mode 100644 index f5f9df209..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0f/a53867500c0f3a5cca9b2112982795fae51c51 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a deleted file mode 100644 index abf2de1e2..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚Ì$3ÓD„®zŒ$`ÁØR"èííÜ~Þâ—µµ¥[Œt껪uUp `ðȇŠ”Q„Cò,:ˆ#Ï%qD³¥]_Ý*Ð@âòœ(r*YY¸Îx¤êC$Ñ™ôîu·ãd¯ãt×OjÛS/em7‹â)D‰^ìÀõ˜êú'7í[—§’ùÃÐ8­ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b deleted file mode 100644 index 6f4196f0d..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 deleted file mode 100644 index 08237c841..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0@Q×9ÅìÉ4ã4¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð2&…H1r‰8Ö‘ -…©J¾NÞýÙv˜f¸MóC?b¯M/¹ÙÅÄ)0œ½wG=&]ÿäξuÝÝ6ˆ,ç \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 deleted file mode 100644 index eb8963927..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 +++ /dev/null @@ -1,2 +0,0 @@ -x}α -Â0€açë2箾¶=m \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/65/401620c5230dfa2ad6e0e2dcb6b447fe21262b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/65/401620c5230dfa2ad6e0e2dcb6b447fe21262b deleted file mode 100644 index a48fefe98..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/65/401620c5230dfa2ad6e0e2dcb6b447fe21262b and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/69/a5c9fb912112305bfe15272855afb50f6acf4b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/69/a5c9fb912112305bfe15272855afb50f6acf4b deleted file mode 100644 index f4e99e6a6..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/69/a5c9fb912112305bfe15272855afb50f6acf4b and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/7c/717449332e4a81f7e5643eef9c95f459444e3f b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/7c/717449332e4a81f7e5643eef9c95f459444e3f deleted file mode 100644 index 07becc026..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/7c/717449332e4a81f7e5643eef9c95f459444e3f +++ /dev/null @@ -1,3 +0,0 @@ -x}ÎM -Â0@a×9Eö‚$™L2"BW=ÆL~P0¶”ß.\»}|‹—×ÞC[¢ÓØkÕ͈TtŒŽ‚Iœ‹ÃLÜÀ‰ÈYL0Qm¼××ÐX •$,–C6!ˆ®z -N8–ØJ&Rü÷u×ó¢§y¹Õ÷íY/yíWmxJ!AÐgkQG=¦FýϽûq…ê Ò±8q \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/90/13b5f12ca8a0fdd44fbe72028500bbac5c89ee b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/90/13b5f12ca8a0fdd44fbe72028500bbac5c89ee deleted file mode 100644 index 93173c9a0..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/90/13b5f12ca8a0fdd44fbe72028500bbac5c89ee and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/4e33d43751b83fbd0b6f0a1796d58462492e47 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/4e33d43751b83fbd0b6f0a1796d58462492e47 deleted file mode 100644 index d2952d0ad..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/4e33d43751b83fbd0b6f0a1796d58462492e47 +++ /dev/null @@ -1,2 +0,0 @@ -x}α -Â0€aç 1648349271 +1100 commit (initial): myfile1 +fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 commit: myfile2 +a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI 1648349271 +1100 commit: myfile3 +6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 commit: myfile4 +ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 reset: moving to HEAD~2 +a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI 1648349271 +1100 commit: myfile4 conflict +6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI 1648349271 +1100 commit: 5 +6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI 1648349271 +1100 commit: 6 +67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI 1648349271 +1100 commit: 7 +3c2846a93bb9c2815e3218ac3c906da26d159068 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349273 +1100 rebase -i (start): checkout ce137eabb7b8df81d4818ac8a16892b1f7327219 +ce137eabb7b8df81d4818ac8a16892b1f7327219 281c7e805fd7bf133611e701ef01f0a4f362f232 CI 1648349278 +1100 rebase -i (continue): myfile4 conflict +281c7e805fd7bf133611e701ef01f0a4f362f232 d13fd4cd73174c7048108d2dc8d277a8e013d1e4 CI 1648349278 +1100 rebase -i (pick): 5 +d13fd4cd73174c7048108d2dc8d277a8e013d1e4 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (pick): 7 +72da3b902dcd9e99b21bdc36891e028b8dbfb219 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..816678825 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 fefea9e2c324080a61d03142554b81e410e9c87f CI 1648349271 +1100 commit (initial): myfile1 +fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 commit: myfile2 +a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI 1648349271 +1100 commit: myfile3 +6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 commit: myfile4 +ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 reset: moving to HEAD~2 +a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI 1648349271 +1100 commit: myfile4 conflict +6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI 1648349271 +1100 commit: 5 +6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI 1648349271 +1100 commit: 6 +67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI 1648349271 +1100 commit: 7 +3c2846a93bb9c2815e3218ac3c906da26d159068 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (finish): refs/heads/master onto ce137eabb7b8df81d4818ac8a16892b1f7327219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..b4fbeb7a0 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 diff --git a/test/integration/push/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/push/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/push/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/push/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 new file mode 100644 index 000000000..01b717854 Binary files /dev/null and b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 differ diff --git a/test/integration/push/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/push/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab new file mode 100644 index 000000000..8a1d879aa Binary files /dev/null and b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 new file mode 100644 index 000000000..3622a8add Binary files /dev/null and b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 new file mode 100644 index 000000000..88e06fe16 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 @@ -0,0 +1,4 @@ +xŽÁ +Â0=ç+rdÓ$›D„žúo“- +Ö–ÁÏ·Ÿàu†©ë²<»u9Ÿú®j‰@‰BÍ "ÉÐ +A"§Æ1ûd6ìúî–šÎE|VIRç8pÎ×P¨-Ð >ý±îvœìuœîúŲ½ôR×åf‡ìC’³gçˆÌA©®ê&šÁ8H \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 new file mode 100644 index 000000000..6282c8a0f Binary files /dev/null and b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6b/a64def9b38eb7bcf5aa1a6c513c490967062ad b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6b/a64def9b38eb7bcf5aa1a6c513c490967062ad new file mode 100644 index 000000000..b23522e37 Binary files /dev/null and b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6b/a64def9b38eb7bcf5aa1a6c513c490967062ad differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 new file mode 100644 index 000000000..d30bb28d3 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 @@ -0,0 +1,3 @@ +xŽK +Â0@]çÙ ’ÉL~ "tÕcLÓ,[J½½=‚«·xummé +ú.bý kŽ0+!*ªò ¨ÙÕFRå3v73( +~¾)ìm/§¸m™çG÷(r蛪7¨U#•H"œà\ÚT…b“bL5Tn­B‚ìÖ²é«{lY¢M¹2'DÍ€j€%'2bråÝïËæ‡Ñ_†ñ¦Ÿ2¯O=µe¾zLA8œ)£?"¸½îS]ÿpùqÝ‚Z7¯ \ No newline at end of file diff --git a/test/integration/push/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/push/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/push/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/push/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f new file mode 100644 index 000000000..8493481ba --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f @@ -0,0 +1,2 @@ +xÍA +Â0@Q×9Åìɤã$¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ðGM…H1qIk¤…†ÂT%_ƒ“w¶¦nÓüÐØkÓKnvdJ!"œ½wG=&]ÿäξuÝÝ3@,Ó \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..388a5b886 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +72da3b902dcd9e99b21bdc36891e028b8dbfb219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..a350da945 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +ce137eabb7b8df81d4818ac8a16892b1f7327219 diff --git a/test/integration/push/expected/myfile1 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 similarity index 100% rename from test/integration/push/expected/myfile1 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 diff --git a/test/integration/push/expected/myfile2 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 similarity index 100% rename from test/integration/push/expected/myfile2 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile3 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/myfile3 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile4 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/myfile4 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile5 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/myfile5 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile7 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 similarity index 100% rename from test/integration/pullRebaseInteractiveWithDrop/expected/myfile7 rename to test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/config b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/config deleted file mode 100644 index fb9626026..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractiveWithDrop/./actual diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a deleted file mode 100644 index abf2de1e2..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚Ì$3ÓD„®zŒ$`ÁØR"èííÜ~Þâ—µµ¥[Œt껪uUp `ðȇŠ”Q„Cò,:ˆ#Ï%qD³¥]_Ý*Ð@âòœ(r*YY¸Îx¤êC$Ñ™ôîu·ãd¯ãt×OjÛS/em7‹â)D‰^ìÀõ˜êú'7í[—§’ùÃÐ8­ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b deleted file mode 100644 index 6f4196f0d..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 deleted file mode 100644 index 08237c841..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0@Q×9ÅìÉ4ã4¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð2&…H1r‰8Ö‘ -…©J¾NÞýÙv˜f¸MóC?b¯M/¹ÙÅÄ)0œ½wG=&]ÿäξuÝÝ6ˆ,ç \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/e0/47462bda495acbe565c85b205d614f38c0a692 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/e0/47462bda495acbe565c85b205d614f38c0a692 deleted file mode 100644 index 528db3bd1..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/e0/47462bda495acbe565c85b205d614f38c0a692 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/packed-refs b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/packed-refs deleted file mode 100644 index 27634cc2c..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -4589efcaf3024e841825bb289bb88eb0e4f8530a refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/setup.sh b/test/integration/pullRebaseInteractiveWithDrop/setup.sh index a0dce709f..fc90cd285 100644 --- a/test/integration/pullRebaseInteractiveWithDrop/setup.sh +++ b/test/integration/pullRebaseInteractiveWithDrop/setup.sh @@ -25,9 +25,9 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo git reset --hard HEAD~2 @@ -47,7 +47,7 @@ echo test > myfile7 git add . git commit -am "7" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/push/expected/.git_keep/FETCH_HEAD b/test/integration/push/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index ecbad2700..000000000 --- a/test/integration/push/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -547f41a06ebd3bee30fbba3f43631810fa24f1bb branch 'master' of ../actual_remote diff --git a/test/integration/push/expected/.git_keep/index b/test/integration/push/expected/.git_keep/index deleted file mode 100644 index 7d490a7c8..000000000 Binary files a/test/integration/push/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/push/expected/.git_keep/logs/HEAD b/test/integration/push/expected/.git_keep/logs/HEAD deleted file mode 100644 index 6c2301554..000000000 --- a/test/integration/push/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 eb831bc1251f71f602159d98f4550e380007ca4f CI 1634897746 +1100 commit (initial): myfile1 -eb831bc1251f71f602159d98f4550e380007ca4f 547f41a06ebd3bee30fbba3f43631810fa24f1bb CI 1634897746 +1100 commit: myfile2 -547f41a06ebd3bee30fbba3f43631810fa24f1bb a09547e07257ed0456f498fde1b8214152427384 CI 1634897746 +1100 commit: myfile3 -a09547e07257ed0456f498fde1b8214152427384 a6e580c7c3c4ea40bc311466d57a946bb3f77541 CI 1634897746 +1100 commit: myfile4 diff --git a/test/integration/push/expected/.git_keep/logs/refs/heads/master b/test/integration/push/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 6c2301554..000000000 --- a/test/integration/push/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 eb831bc1251f71f602159d98f4550e380007ca4f CI 1634897746 +1100 commit (initial): myfile1 -eb831bc1251f71f602159d98f4550e380007ca4f 547f41a06ebd3bee30fbba3f43631810fa24f1bb CI 1634897746 +1100 commit: myfile2 -547f41a06ebd3bee30fbba3f43631810fa24f1bb a09547e07257ed0456f498fde1b8214152427384 CI 1634897746 +1100 commit: myfile3 -a09547e07257ed0456f498fde1b8214152427384 a6e580c7c3c4ea40bc311466d57a946bb3f77541 CI 1634897746 +1100 commit: myfile4 diff --git a/test/integration/push/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/push/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index a82757c78..000000000 --- a/test/integration/push/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 547f41a06ebd3bee30fbba3f43631810fa24f1bb CI 1634897746 +1100 fetch origin: storing head -547f41a06ebd3bee30fbba3f43631810fa24f1bb a6e580c7c3c4ea40bc311466d57a946bb3f77541 CI 1634897748 +1100 update by push diff --git a/test/integration/push/expected/.git_keep/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb b/test/integration/push/expected/.git_keep/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb deleted file mode 100644 index 419d9ecdf..000000000 Binary files a/test/integration/push/expected/.git_keep/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb and /dev/null differ diff --git a/test/integration/push/expected/.git_keep/objects/a0/9547e07257ed0456f498fde1b8214152427384 b/test/integration/push/expected/.git_keep/objects/a0/9547e07257ed0456f498fde1b8214152427384 deleted file mode 100644 index 02e8b627c..000000000 --- a/test/integration/push/expected/.git_keep/objects/a0/9547e07257ed0456f498fde1b8214152427384 +++ /dev/null @@ -1,2 +0,0 @@ -xŽA -Â0E]çÙ ’éLÓ"BW=ÆL:ƒ…Æ–AooŽàêÃã=øy+e©®tª‡ªïÌ)Âl„hLhÆ3 ¥“ t¹o›Õí|è«úž#àUfU &ÂØ∠wd âø]ŸÛáÇÉßÆé¡.ûª—¼•»‡ˆ”®Ã@ÑŸBp¶SUÿÔ]ùÚ²*º`L;W \ No newline at end of file diff --git a/test/integration/push/expected/.git_keep/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 b/test/integration/push/expected/.git_keep/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 deleted file mode 100644 index e50d53ba1..000000000 --- a/test/integration/push/expected/.git_keep/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 +++ /dev/null @@ -1,4 +0,0 @@ -xÎM -Â0@a×9Eö‚Ì$󓀈àªÇHÛ Œ-%‚Þ^àöñ-Þ´¶¶t™}7ó¡ -*CL@1U¤E8•Èb*"O…3º­ìöì¾@fR ¬6±TʩΆc -HÈ‚ÆD®¼ú}ÝýmðçÛpµwiÛÃNÓÚ.%Rʪ$þˆà~õ7ÕíOîÚ§.#÷Zè7Ë \ No newline at end of file diff --git a/test/integration/push/expected/.git_keep/objects/eb/831bc1251f71f602159d98f4550e380007ca4f b/test/integration/push/expected/.git_keep/objects/eb/831bc1251f71f602159d98f4550e380007ca4f deleted file mode 100644 index 4acb8b3ca..000000000 --- a/test/integration/push/expected/.git_keep/objects/eb/831bc1251f71f602159d98f4550e380007ca4f +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJF§“¥®<ƘL¨à")´·×#tûyðS5[ ñ¥íªà•SñÂK4f"ÅÈ9b'X-Ôg¦"éÞ9ù´WÝašá1Í£~ÅÞ›ÞRµ' ÷‡ˆáŠè½;ë9iú'wö+ë¦è6ˆ,ç \ No newline at end of file diff --git a/test/integration/push/expected/.git_keep/refs/heads/master b/test/integration/push/expected/.git_keep/refs/heads/master deleted file mode 100644 index ccbf04e76..000000000 --- a/test/integration/push/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a6e580c7c3c4ea40bc311466d57a946bb3f77541 diff --git a/test/integration/push/expected/.git_keep/refs/remotes/origin/master b/test/integration/push/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index ccbf04e76..000000000 --- a/test/integration/push/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -a6e580c7c3c4ea40bc311466d57a946bb3f77541 diff --git a/test/integration/pushAndSetUpstream/expected_remote/HEAD b/test/integration/push/expected/origin/HEAD similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/HEAD rename to test/integration/push/expected/origin/HEAD diff --git a/test/integration/pullMerge/expected_remote/config b/test/integration/push/expected/origin/config similarity index 80% rename from test/integration/pullMerge/expected_remote/config rename to test/integration/push/expected/origin/config index 5a46fafb8..f190da0bc 100644 --- a/test/integration/pullMerge/expected_remote/config +++ b/test/integration/push/expected/origin/config @@ -5,4 +5,4 @@ ignorecase = true precomposeunicode = true [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMerge/./actual + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/push/actual/./repo diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/description b/test/integration/push/expected/origin/description similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/description rename to test/integration/push/expected/origin/description diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/info/exclude b/test/integration/push/expected/origin/info/exclude similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/info/exclude rename to test/integration/push/expected/origin/info/exclude diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/push/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/push/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/push/expected/origin/objects/14/6ca480a776a466024a08d273987c4b2e71f23b b/test/integration/push/expected/origin/objects/14/6ca480a776a466024a08d273987c4b2e71f23b new file mode 100644 index 000000000..a3d79e190 --- /dev/null +++ b/test/integration/push/expected/origin/objects/14/6ca480a776a466024a08d273987c4b2e71f23b @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9Eö‚d&ÓIDW=F:`ÁX)ôöön?oñummé„}3ó%E‚2H ólV…ÅXêÄ‘32ψS¨HÀîU6{vŸ€†”$F£¬*‰RÈ(UBŚ͕w¿¯›¿þ|¯ö)íõ°“®íâ)GʈÙBp{ݧºýÉ]ûÖåaè~;Œ9 \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/push/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/push/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/push/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/push/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/push/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/push/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/push/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/push/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/push/expected/origin/objects/69/fef9300b95338821093ec2dfb6e2974d303510 b/test/integration/push/expected/origin/objects/69/fef9300b95338821093ec2dfb6e2974d303510 new file mode 100644 index 000000000..ea7faca6b Binary files /dev/null and b/test/integration/push/expected/origin/objects/69/fef9300b95338821093ec2dfb6e2974d303510 differ diff --git a/test/integration/push/expected/origin/objects/71/4500c4933e4316cc9747711829560cc42c2f8e b/test/integration/push/expected/origin/objects/71/4500c4933e4316cc9747711829560cc42c2f8e new file mode 100644 index 000000000..ec5ba1314 --- /dev/null +++ b/test/integration/push/expected/origin/objects/71/4500c4933e4316cc9747711829560cc42c2f8e @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJ&NÇ))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çþ¡’‰…³`ˆXzš©ËL%¦{pñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éHB¸"zïÎzNšþÉ}˲*º3,Õ \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/push/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/push/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/push/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/push/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/push/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/push/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/push/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/push/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/push/expected/origin/objects/ee/53190e06796d55bf236a35d45249c90eff8594 b/test/integration/push/expected/origin/objects/ee/53190e06796d55bf236a35d45249c90eff8594 new file mode 100644 index 000000000..ca0b896d7 Binary files /dev/null and b/test/integration/push/expected/origin/objects/ee/53190e06796d55bf236a35d45249c90eff8594 differ diff --git a/test/integration/push/expected/origin/packed-refs b/test/integration/push/expected/origin/packed-refs new file mode 100644 index 000000000..418f3935f --- /dev/null +++ b/test/integration/push/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +146ca480a776a466024a08d273987c4b2e71f23b refs/heads/master diff --git a/test/integration/push/expected/origin/refs/heads/master b/test/integration/push/expected/origin/refs/heads/master new file mode 100644 index 000000000..b77d8cdb7 --- /dev/null +++ b/test/integration/push/expected/origin/refs/heads/master @@ -0,0 +1 @@ +69fef9300b95338821093ec2dfb6e2974d303510 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG b/test/integration/push/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/push/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/push/expected/repo/.git_keep/FETCH_HEAD b/test/integration/push/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..26ee184b7 --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +146ca480a776a466024a08d273987c4b2e71f23b branch 'master' of ../origin diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/HEAD b/test/integration/push/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/HEAD rename to test/integration/push/expected/repo/.git_keep/HEAD diff --git a/test/integration/pull/expected/.git_keep/config b/test/integration/push/expected/repo/.git_keep/config similarity index 92% rename from test/integration/pull/expected/.git_keep/config rename to test/integration/push/expected/repo/.git_keep/config index 821803a3e..7721ae814 100644 --- a/test/integration/pull/expected/.git_keep/config +++ b/test/integration/push/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pushAndSetUpstream/expected_remote/description b/test/integration/push/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/description rename to test/integration/push/expected/repo/.git_keep/description diff --git a/test/integration/push/expected/repo/.git_keep/index b/test/integration/push/expected/repo/.git_keep/index new file mode 100644 index 000000000..b5391b42b Binary files /dev/null and b/test/integration/push/expected/repo/.git_keep/index differ diff --git a/test/integration/pushAndSetUpstream/expected_remote/info/exclude b/test/integration/push/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/info/exclude rename to test/integration/push/expected/repo/.git_keep/info/exclude diff --git a/test/integration/push/expected/repo/.git_keep/logs/HEAD b/test/integration/push/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..859603aeb --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 714500c4933e4316cc9747711829560cc42c2f8e CI 1648348228 +1100 commit (initial): myfile1 +714500c4933e4316cc9747711829560cc42c2f8e 146ca480a776a466024a08d273987c4b2e71f23b CI 1648348228 +1100 commit: myfile2 +146ca480a776a466024a08d273987c4b2e71f23b ee53190e06796d55bf236a35d45249c90eff8594 CI 1648348228 +1100 commit: myfile3 +ee53190e06796d55bf236a35d45249c90eff8594 69fef9300b95338821093ec2dfb6e2974d303510 CI 1648348228 +1100 commit: myfile4 diff --git a/test/integration/push/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/push/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..859603aeb --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 714500c4933e4316cc9747711829560cc42c2f8e CI 1648348228 +1100 commit (initial): myfile1 +714500c4933e4316cc9747711829560cc42c2f8e 146ca480a776a466024a08d273987c4b2e71f23b CI 1648348228 +1100 commit: myfile2 +146ca480a776a466024a08d273987c4b2e71f23b ee53190e06796d55bf236a35d45249c90eff8594 CI 1648348228 +1100 commit: myfile3 +ee53190e06796d55bf236a35d45249c90eff8594 69fef9300b95338821093ec2dfb6e2974d303510 CI 1648348228 +1100 commit: myfile4 diff --git a/test/integration/push/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/push/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..03b67d245 --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 146ca480a776a466024a08d273987c4b2e71f23b CI 1648348228 +1100 fetch origin: storing head +146ca480a776a466024a08d273987c4b2e71f23b 69fef9300b95338821093ec2dfb6e2974d303510 CI 1648348229 +1100 update by push diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/push/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/push/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/push/expected/repo/.git_keep/objects/14/6ca480a776a466024a08d273987c4b2e71f23b b/test/integration/push/expected/repo/.git_keep/objects/14/6ca480a776a466024a08d273987c4b2e71f23b new file mode 100644 index 000000000..a3d79e190 --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/objects/14/6ca480a776a466024a08d273987c4b2e71f23b @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9Eö‚d&ÓIDW=F:`ÁX)ôöön?oñummé„}3ó%E‚2H ólV…ÅXêÄ‘32ψS¨HÀîU6{vŸ€†”$F£¬*‰RÈ(UBŚ͕w¿¯›¿þ|¯ö)íõ°“®íâ)GʈÙBp{ݧºýÉ]ûÖåaè~;Œ9 \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/push/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/push/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/push/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/push/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/push/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/push/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/push/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/push/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/push/expected/repo/.git_keep/objects/69/fef9300b95338821093ec2dfb6e2974d303510 b/test/integration/push/expected/repo/.git_keep/objects/69/fef9300b95338821093ec2dfb6e2974d303510 new file mode 100644 index 000000000..ea7faca6b Binary files /dev/null and b/test/integration/push/expected/repo/.git_keep/objects/69/fef9300b95338821093ec2dfb6e2974d303510 differ diff --git a/test/integration/push/expected/repo/.git_keep/objects/71/4500c4933e4316cc9747711829560cc42c2f8e b/test/integration/push/expected/repo/.git_keep/objects/71/4500c4933e4316cc9747711829560cc42c2f8e new file mode 100644 index 000000000..ec5ba1314 --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/objects/71/4500c4933e4316cc9747711829560cc42c2f8e @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJ&NÇ))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çþ¡’‰…³`ˆXzš©ËL%¦{pñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éHB¸"zïÎzNšþÉ}˲*º3,Õ \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/push/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/push/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/push/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/push/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/push/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/push/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/push/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/push/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/push/expected/repo/.git_keep/objects/ee/53190e06796d55bf236a35d45249c90eff8594 b/test/integration/push/expected/repo/.git_keep/objects/ee/53190e06796d55bf236a35d45249c90eff8594 new file mode 100644 index 000000000..ca0b896d7 Binary files /dev/null and b/test/integration/push/expected/repo/.git_keep/objects/ee/53190e06796d55bf236a35d45249c90eff8594 differ diff --git a/test/integration/push/expected/repo/.git_keep/refs/heads/master b/test/integration/push/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..b77d8cdb7 --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +69fef9300b95338821093ec2dfb6e2974d303510 diff --git a/test/integration/push/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/push/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..b77d8cdb7 --- /dev/null +++ b/test/integration/push/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +69fef9300b95338821093ec2dfb6e2974d303510 diff --git a/test/integration/pushAndSetUpstream/expected/myfile1 b/test/integration/push/expected/repo/myfile1 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/myfile1 rename to test/integration/push/expected/repo/myfile1 diff --git a/test/integration/pushAndSetUpstream/expected/myfile2 b/test/integration/push/expected/repo/myfile2 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/myfile2 rename to test/integration/push/expected/repo/myfile2 diff --git a/test/integration/push/expected/myfile3 b/test/integration/push/expected/repo/myfile3 similarity index 100% rename from test/integration/push/expected/myfile3 rename to test/integration/push/expected/repo/myfile3 diff --git a/test/integration/push/expected/myfile4 b/test/integration/push/expected/repo/myfile4 similarity index 100% rename from test/integration/push/expected/myfile4 rename to test/integration/push/expected/repo/myfile4 diff --git a/test/integration/push/expected_remote/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb b/test/integration/push/expected_remote/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb deleted file mode 100644 index 419d9ecdf..000000000 Binary files a/test/integration/push/expected_remote/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb and /dev/null differ diff --git a/test/integration/push/expected_remote/objects/a0/9547e07257ed0456f498fde1b8214152427384 b/test/integration/push/expected_remote/objects/a0/9547e07257ed0456f498fde1b8214152427384 deleted file mode 100644 index 02e8b627c..000000000 --- a/test/integration/push/expected_remote/objects/a0/9547e07257ed0456f498fde1b8214152427384 +++ /dev/null @@ -1,2 +0,0 @@ -xŽA -Â0E]çÙ ’éLÓ"BW=ÆL:ƒ…Æ–AooŽàêÃã=øy+e©®tª‡ªïÌ)Âl„hLhÆ3 ¥“ t¹o›Õí|è«úž#àUfU &ÂØ∠wd âø]ŸÛáÇÉßÆé¡.ûª—¼•»‡ˆ”®Ã@ÑŸBp¶SUÿÔ]ùÚ²*º`L;W \ No newline at end of file diff --git a/test/integration/push/expected_remote/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 b/test/integration/push/expected_remote/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 deleted file mode 100644 index e50d53ba1..000000000 --- a/test/integration/push/expected_remote/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 +++ /dev/null @@ -1,4 +0,0 @@ -xÎM -Â0@a×9Eö‚Ì$󓀈àªÇHÛ Œ-%‚Þ^àöñ-Þ´¶¶t™}7ó¡ -*CL@1U¤E8•Èb*"O…3º­ìöì¾@fR ¬6±TʩΆc -HÈ‚ÆD®¼ú}ÝýmðçÛpµwiÛÃNÓÚ.%Rʪ$þˆà~õ7ÕíOîÚ§.#÷Zè7Ë \ No newline at end of file diff --git a/test/integration/push/expected_remote/objects/eb/831bc1251f71f602159d98f4550e380007ca4f b/test/integration/push/expected_remote/objects/eb/831bc1251f71f602159d98f4550e380007ca4f deleted file mode 100644 index 4acb8b3ca..000000000 --- a/test/integration/push/expected_remote/objects/eb/831bc1251f71f602159d98f4550e380007ca4f +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJF§“¥®<ƘL¨à")´·×#tûyðS5[ ñ¥íªà•SñÂK4f"ÅÈ9b'X-Ôg¦"éÞ9ù´WÝašá1Í£~ÅÞ›ÞRµ' ÷‡ˆáŠè½;ë9iú'wö+ë¦è6ˆ,ç \ No newline at end of file diff --git a/test/integration/push/expected_remote/packed-refs b/test/integration/push/expected_remote/packed-refs deleted file mode 100644 index 0c4bde9c0..000000000 --- a/test/integration/push/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -547f41a06ebd3bee30fbba3f43631810fa24f1bb refs/heads/master diff --git a/test/integration/push/expected_remote/refs/heads/master b/test/integration/push/expected_remote/refs/heads/master deleted file mode 100644 index ccbf04e76..000000000 --- a/test/integration/push/expected_remote/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a6e580c7c3c4ea40bc311466d57a946bb3f77541 diff --git a/test/integration/push/setup.sh b/test/integration/push/setup.sh index 075e9afd9..ec135f72e 100644 --- a/test/integration/push/setup.sh +++ b/test/integration/push/setup.sh @@ -19,9 +19,9 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo echo test3 > myfile3 git add . @@ -30,6 +30,6 @@ echo test4 > myfile4 git add . git commit -am "myfile4" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstream/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 989da164a..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -dab77371cf53420955fc9baeb84303414f7e4a60 not-for-merge branch 'master' of ../actual_remote diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/index b/test/integration/pushAndSetUpstream/expected/.git_keep/index deleted file mode 100644 index b9df8bc71..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/HEAD deleted file mode 100644 index ab1e651fb..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 65c52315dc238c164b914369f49bd70882cc1d85 CI 1634897751 +1100 commit (initial): myfile1 -65c52315dc238c164b914369f49bd70882cc1d85 dab77371cf53420955fc9baeb84303414f7e4a60 CI 1634897751 +1100 commit: myfile2 -dab77371cf53420955fc9baeb84303414f7e4a60 dbd679941d871665b7ff70fffe6116725e56e270 CI 1634897751 +1100 commit: myfile3 -dbd679941d871665b7ff70fffe6116725e56e270 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897751 +1100 commit: myfile4 -707a2a0835c897496934849bf6e0815593b140b3 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897753 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 0efb79581..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 65c52315dc238c164b914369f49bd70882cc1d85 CI 1634897751 +1100 commit (initial): myfile1 -65c52315dc238c164b914369f49bd70882cc1d85 dab77371cf53420955fc9baeb84303414f7e4a60 CI 1634897751 +1100 commit: myfile2 -dab77371cf53420955fc9baeb84303414f7e4a60 dbd679941d871665b7ff70fffe6116725e56e270 CI 1634897751 +1100 commit: myfile3 -dbd679941d871665b7ff70fffe6116725e56e270 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897751 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/test deleted file mode 100644 index c22f24f3c..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897753 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 2b03e0efd..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 dab77371cf53420955fc9baeb84303414f7e4a60 CI 1634897751 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/test deleted file mode 100644 index 1e7209170..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897754 +1100 update by push diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/65/c52315dc238c164b914369f49bd70882cc1d85 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/65/c52315dc238c164b914369f49bd70882cc1d85 deleted file mode 100644 index 9f235e0ed..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/65/c52315dc238c164b914369f49bd70882cc1d85 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/70/7a2a0835c897496934849bf6e0815593b140b3 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/70/7a2a0835c897496934849bf6e0815593b140b3 deleted file mode 100644 index 3556acfa5..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/70/7a2a0835c897496934849bf6e0815593b140b3 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 deleted file mode 100644 index fd638ab15..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/db/d679941d871665b7ff70fffe6116725e56e270 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/db/d679941d871665b7ff70fffe6116725e56e270 deleted file mode 100644 index 49cc241d7..000000000 Binary files a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/db/d679941d871665b7ff70fffe6116725e56e270 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/master deleted file mode 100644 index 683d3d319..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/test deleted file mode 100644 index 683d3d319..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 874cd1689..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -dab77371cf53420955fc9baeb84303414f7e4a60 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/test deleted file mode 100644 index 683d3d319..000000000 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushFollowTags/expected/.git_keep/HEAD b/test/integration/pushAndSetUpstream/expected/origin/HEAD similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/HEAD rename to test/integration/pushAndSetUpstream/expected/origin/HEAD diff --git a/test/integration/pushAndSetUpstream/expected/origin/config b/test/integration/pushAndSetUpstream/expected/origin/config new file mode 100644 index 000000000..18e379b43 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushAndSetUpstream/actual/./repo diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/description b/test/integration/pushAndSetUpstream/expected/origin/description similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/description rename to test/integration/pushAndSetUpstream/expected/origin/description diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/info/exclude b/test/integration/pushAndSetUpstream/expected/origin/info/exclude similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/info/exclude rename to test/integration/pushAndSetUpstream/expected/origin/info/exclude diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pushAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 b/test/integration/pushAndSetUpstream/expected/origin/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 new file mode 100644 index 000000000..dd4d890c2 Binary files /dev/null and b/test/integration/pushAndSetUpstream/expected/origin/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pushAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d b/test/integration/pushAndSetUpstream/expected/origin/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d new file mode 100644 index 000000000..d8f35d219 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/origin/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d @@ -0,0 +1,2 @@ +xÎM +Â0@a×9Eö‚d2?MADèªÇHÚ,[J½½=‚ÛÇ·xÓZëÒ<ôtj»ª&ÐQà€)&* Â)#‹v yÊ܃Ûò®¯æÕ Éz•ˆ¨ŒÄ€¥P‰À4gÒyF˜Ð\~·Çºûaô×a¼ë'×í©—i­7B )Åý wÔcªéŸÜÕ¯-O%÷×r8Ê \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushAndSetUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/e0/c356303c1b9b8fbe6acddb3e58f28b52348c60 b/test/integration/pushAndSetUpstream/expected/origin/objects/e0/c356303c1b9b8fbe6acddb3e58f28b52348c60 new file mode 100644 index 000000000..33e4be4e0 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/origin/objects/e0/c356303c1b9b8fbe6acddb3e58f28b52348c60 @@ -0,0 +1,3 @@ +xÍA +à @Ñ®=Åì ÅÑé8… +YåFGˆ‚…ôöͺý<ø©Õºt@âKßUÁ*§b#Ïá¡’‰…³ ‹XÍä3S‰éîLüôwÛaœà9N/=bÝV½¥V@&ñ$.x¸"ZkÎzNºþÉMý–eU4?3‹,Õ \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/origin/objects/ef/f34f9e6233e534513bb4b2154da4edd316283f b/test/integration/pushAndSetUpstream/expected/origin/objects/ef/f34f9e6233e534513bb4b2154da4edd316283f new file mode 100644 index 000000000..e9e90781f --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/origin/objects/ef/f34f9e6233e534513bb4b2154da4edd316283f @@ -0,0 +1,2 @@ +xŽA +à E»öî ÅqÔ(„RÈ*ÇÐÉ Ä& ííëºzðx>íµ®MCr—v2k[`@Šqˆ’ŠäP¢¡X,ùNbuä“_M§!b0Ô­É ÀÁ¥x)Pßy†Â)X•ßí¹Ÿzšõ8Íþäzl|£½Þ5ÑE; ¾£ºí§ÿ™«ú•ucT? *:› \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/origin/packed-refs b/test/integration/pushAndSetUpstream/expected/origin/packed-refs new file mode 100644 index 000000000..7b481f224 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +978360cc5c0a9115bf3db5f10196cd135e1be962 refs/heads/master diff --git a/test/integration/pushAndSetUpstream/expected/origin/refs/heads/test b/test/integration/pushAndSetUpstream/expected/origin/refs/heads/test new file mode 100644 index 000000000..21ce8deb5 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/origin/refs/heads/test @@ -0,0 +1 @@ +d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..0ff8d1b7a --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +978360cc5c0a9115bf3db5f10196cd135e1be962 not-for-merge branch 'master' of ../origin diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/HEAD b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pushAndSetUpstream/expected/.git_keep/HEAD rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/HEAD diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/config b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/config similarity index 93% rename from test/integration/pushAndSetUpstream/expected/.git_keep/config rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/config index 7b5eaec7c..2b6dd06c7 100644 --- a/test/integration/pushAndSetUpstream/expected/.git_keep/config +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [push] default = nothing diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/description b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/description rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/description diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/index b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/index new file mode 100644 index 000000000..701b9194f Binary files /dev/null and b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/index differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/info/exclude b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/info/exclude rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..b97dee17d --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 e0c356303c1b9b8fbe6acddb3e58f28b52348c60 CI 1648348273 +1100 commit (initial): myfile1 +e0c356303c1b9b8fbe6acddb3e58f28b52348c60 978360cc5c0a9115bf3db5f10196cd135e1be962 CI 1648348273 +1100 commit: myfile2 +978360cc5c0a9115bf3db5f10196cd135e1be962 eff34f9e6233e534513bb4b2154da4edd316283f CI 1648348273 +1100 commit: myfile3 +eff34f9e6233e534513bb4b2154da4edd316283f d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348273 +1100 commit: myfile4 +d77ec09ecf2391f9b76e54de98187095cd2edf9d d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348275 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..34ef6da51 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 e0c356303c1b9b8fbe6acddb3e58f28b52348c60 CI 1648348273 +1100 commit (initial): myfile1 +e0c356303c1b9b8fbe6acddb3e58f28b52348c60 978360cc5c0a9115bf3db5f10196cd135e1be962 CI 1648348273 +1100 commit: myfile2 +978360cc5c0a9115bf3db5f10196cd135e1be962 eff34f9e6233e534513bb4b2154da4edd316283f CI 1648348273 +1100 commit: myfile3 +eff34f9e6233e534513bb4b2154da4edd316283f d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348273 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/test new file mode 100644 index 000000000..9e9eedef1 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348275 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..75fe60b40 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 978360cc5c0a9115bf3db5f10196cd135e1be962 CI 1648348273 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/test new file mode 100644 index 000000000..53f60551f --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 d77ec09ecf2391f9b76e54de98187095cd2edf9d CI 1648348276 +1100 update by push diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pushAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 new file mode 100644 index 000000000..dd4d890c2 Binary files /dev/null and b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/97/8360cc5c0a9115bf3db5f10196cd135e1be962 differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d new file mode 100644 index 000000000..d8f35d219 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/d7/7ec09ecf2391f9b76e54de98187095cd2edf9d @@ -0,0 +1,2 @@ +xÎM +Â0@a×9Eö‚d2?MADèªÇHÚ,[J½½=‚ÛÇ·xÓZëÒ<ôtj»ª&ÐQà€)&* Â)#‹v yÊ܃Ûò®¯æÕ Éz•ˆ¨ŒÄ€¥P‰À4gÒyF˜Ð\~·Çºûaô×a¼ë'×í©—i­7B )Åý wÔcªéŸÜÕ¯-O%÷×r8Ê \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/e0/c356303c1b9b8fbe6acddb3e58f28b52348c60 b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/e0/c356303c1b9b8fbe6acddb3e58f28b52348c60 new file mode 100644 index 000000000..33e4be4e0 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/e0/c356303c1b9b8fbe6acddb3e58f28b52348c60 @@ -0,0 +1,3 @@ +xÍA +à @Ñ®=Åì ÅÑé8… +YåFGˆ‚…ôöͺý<ø©Õºt@âKßUÁ*§b#Ïá¡’‰…³ ‹XÍä3S‰éîLüôwÛaœà9N/=bÝV½¥V@&ñ$.x¸"ZkÎzNºþÉMý–eU4?3‹,Õ \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/ef/f34f9e6233e534513bb4b2154da4edd316283f b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/ef/f34f9e6233e534513bb4b2154da4edd316283f new file mode 100644 index 000000000..e9e90781f --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/objects/ef/f34f9e6233e534513bb4b2154da4edd316283f @@ -0,0 +1,2 @@ +xŽA +à E»öî ÅqÔ(„RÈ*ÇÐÉ Ä& ííëºzðx>íµ®MCr—v2k[`@Šqˆ’ŠäP¢¡X,ùNbuä“_M§!b0Ô­É ÀÁ¥x)Pßy†Â)X•ßí¹Ÿzšõ8Íþäzl|£½Þ5ÑE; ¾£ºí§ÿ™«ú•ucT? *:› \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..21ce8deb5 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/test new file mode 100644 index 000000000..21ce8deb5 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/heads/test @@ -0,0 +1 @@ +d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..2539af585 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +978360cc5c0a9115bf3db5f10196cd135e1be962 diff --git a/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/test new file mode 100644 index 000000000..21ce8deb5 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/test @@ -0,0 +1 @@ +d77ec09ecf2391f9b76e54de98187095cd2edf9d diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile1 b/test/integration/pushAndSetUpstream/expected/repo/myfile1 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/myfile1 rename to test/integration/pushAndSetUpstream/expected/repo/myfile1 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile2 b/test/integration/pushAndSetUpstream/expected/repo/myfile2 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/myfile2 rename to test/integration/pushAndSetUpstream/expected/repo/myfile2 diff --git a/test/integration/pushAndSetUpstream/expected/myfile3 b/test/integration/pushAndSetUpstream/expected/repo/myfile3 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/myfile3 rename to test/integration/pushAndSetUpstream/expected/repo/myfile3 diff --git a/test/integration/pushAndSetUpstream/expected/myfile4 b/test/integration/pushAndSetUpstream/expected/repo/myfile4 similarity index 100% rename from test/integration/pushAndSetUpstream/expected/myfile4 rename to test/integration/pushAndSetUpstream/expected/repo/myfile4 diff --git a/test/integration/pushAndSetUpstream/expected_remote/config b/test/integration/pushAndSetUpstream/expected_remote/config deleted file mode 100644 index de756510f..000000000 --- a/test/integration/pushAndSetUpstream/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushAndSetUpstream/./actual diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/65/c52315dc238c164b914369f49bd70882cc1d85 b/test/integration/pushAndSetUpstream/expected_remote/objects/65/c52315dc238c164b914369f49bd70882cc1d85 deleted file mode 100644 index 9f235e0ed..000000000 Binary files a/test/integration/pushAndSetUpstream/expected_remote/objects/65/c52315dc238c164b914369f49bd70882cc1d85 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/70/7a2a0835c897496934849bf6e0815593b140b3 b/test/integration/pushAndSetUpstream/expected_remote/objects/70/7a2a0835c897496934849bf6e0815593b140b3 deleted file mode 100644 index 3556acfa5..000000000 Binary files a/test/integration/pushAndSetUpstream/expected_remote/objects/70/7a2a0835c897496934849bf6e0815593b140b3 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 b/test/integration/pushAndSetUpstream/expected_remote/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 deleted file mode 100644 index fd638ab15..000000000 Binary files a/test/integration/pushAndSetUpstream/expected_remote/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/db/d679941d871665b7ff70fffe6116725e56e270 b/test/integration/pushAndSetUpstream/expected_remote/objects/db/d679941d871665b7ff70fffe6116725e56e270 deleted file mode 100644 index 49cc241d7..000000000 Binary files a/test/integration/pushAndSetUpstream/expected_remote/objects/db/d679941d871665b7ff70fffe6116725e56e270 and /dev/null differ diff --git a/test/integration/pushAndSetUpstream/expected_remote/packed-refs b/test/integration/pushAndSetUpstream/expected_remote/packed-refs deleted file mode 100644 index 8271e61c9..000000000 --- a/test/integration/pushAndSetUpstream/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -dab77371cf53420955fc9baeb84303414f7e4a60 refs/heads/master diff --git a/test/integration/pushAndSetUpstream/expected_remote/refs/heads/test b/test/integration/pushAndSetUpstream/expected_remote/refs/heads/test deleted file mode 100644 index 683d3d319..000000000 --- a/test/integration/pushAndSetUpstream/expected_remote/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushAndSetUpstream/setup.sh b/test/integration/pushAndSetUpstream/setup.sh index 6c4c85af6..c4fa44969 100644 --- a/test/integration/pushAndSetUpstream/setup.sh +++ b/test/integration/pushAndSetUpstream/setup.sh @@ -19,9 +19,9 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo echo test3 > myfile3 git add . @@ -30,6 +30,6 @@ echo test4 > myfile4 git add . git commit -am "myfile4" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git config push.default nothing diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index adf0b729b..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -dc7117cc68b23798cabb2c388a45036da33c2f10 not-for-merge branch 'master' of ../actual_remote diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/index b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/index deleted file mode 100644 index 6bf05e8bb..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/HEAD deleted file mode 100644 index 734f642ab..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 d0e2575d4cdf78f6845db57439c7b526d02dbc7d CI 1634897757 +1100 commit (initial): myfile1 -d0e2575d4cdf78f6845db57439c7b526d02dbc7d dc7117cc68b23798cabb2c388a45036da33c2f10 CI 1634897757 +1100 commit: myfile2 -dc7117cc68b23798cabb2c388a45036da33c2f10 6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 CI 1634897757 +1100 commit: myfile3 -6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897757 +1100 commit: myfile4 -2d0011f18dcd00e21fd13ede01792048ccd09e85 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897760 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 00e298ce4..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 d0e2575d4cdf78f6845db57439c7b526d02dbc7d CI 1634897757 +1100 commit (initial): myfile1 -d0e2575d4cdf78f6845db57439c7b526d02dbc7d dc7117cc68b23798cabb2c388a45036da33c2f10 CI 1634897757 +1100 commit: myfile2 -dc7117cc68b23798cabb2c388a45036da33c2f10 6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 CI 1634897757 +1100 commit: myfile3 -6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897757 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/test deleted file mode 100644 index 26a649f81..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897760 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 63ed3051f..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 dc7117cc68b23798cabb2c388a45036da33c2f10 CI 1634897757 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/test deleted file mode 100644 index 8b11b4981..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897761 +1100 update by push diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 deleted file mode 100644 index 3b028eaf7..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 deleted file mode 100644 index 5e637927f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d deleted file mode 100644 index d93d894fa..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJFÇ™¥\yŒ˜L¨à‘ÚÛ×#tûyðS5[ ñ¥ªà•Sñ‘5d"ÅÀ9`±-Ôg¦Óйøn¯zÀ4Ã}šŸú‰¶ozKÕ€ÜSE+¢÷î¬ç¤éŸÜÙ·¬›¢û7,,ë \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 deleted file mode 100644 index bd9a3df16..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/master deleted file mode 100644 index fcd0d8e35..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/test deleted file mode 100644 index fcd0d8e35..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index caea74126..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -dc7117cc68b23798cabb2c388a45036da33c2f10 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/test deleted file mode 100644 index fcd0d8e35..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/test +++ /dev/null @@ -1 +0,0 @@ -2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushFollowTags/expected_remote/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/origin/HEAD similarity index 100% rename from test/integration/pushFollowTags/expected_remote/HEAD rename to test/integration/pushAndSetUpstreamDefault/expected/origin/HEAD diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/config b/test/integration/pushAndSetUpstreamDefault/expected/origin/config new file mode 100644 index 000000000..b6cfc193d --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushAndSetUpstreamDefault/actual/./repo diff --git a/test/integration/pushFollowTags/expected/.git_keep/description b/test/integration/pushAndSetUpstreamDefault/expected/origin/description similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/description rename to test/integration/pushAndSetUpstreamDefault/expected/origin/description diff --git a/test/integration/pushFollowTags/expected/.git_keep/info/exclude b/test/integration/pushAndSetUpstreamDefault/expected/origin/info/exclude similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/info/exclude rename to test/integration/pushAndSetUpstreamDefault/expected/origin/info/exclude diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 new file mode 100644 index 000000000..7fbedd38e Binary files /dev/null and b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 new file mode 100644 index 000000000..60b6c9ee5 Binary files /dev/null and b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e new file mode 100644 index 000000000..5bca7d1d2 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJ&NÇ))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çþ¡’‰…³`ˆXzš©ËL%¦{pñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éH‚\½wg='MÿäξeYÝ4/,Ù \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e new file mode 100644 index 000000000..a80d7de45 Binary files /dev/null and b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e differ diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstreamDefault/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushAndSetUpstreamDefault/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/packed-refs b/test/integration/pushAndSetUpstreamDefault/expected/origin/packed-refs new file mode 100644 index 000000000..2212696c5 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +309d64f4b30c8a17897642eb8966189d2b054af2 refs/heads/master diff --git a/test/integration/pushAndSetUpstreamDefault/expected/origin/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/origin/refs/heads/test new file mode 100644 index 000000000..088420ba8 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/origin/refs/heads/test @@ -0,0 +1 @@ +83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..088c0e840 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +309d64f4b30c8a17897642eb8966189d2b054af2 not-for-merge branch 'master' of ../origin diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/HEAD rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/HEAD diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/config b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/config similarity index 93% rename from test/integration/pushAndSetUpstreamDefault/expected/.git_keep/config rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/config index ec0727bec..735b55597 100644 --- a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/config +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [push] default = current diff --git a/test/integration/pushFollowTags/expected_remote/description b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pushFollowTags/expected_remote/description rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/description diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/index b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/index new file mode 100644 index 000000000..6f272ffd6 Binary files /dev/null and b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/index differ diff --git a/test/integration/pushFollowTags/expected_remote/info/exclude b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pushFollowTags/expected_remote/info/exclude rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..25cc9239c --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 8deea9ab6bed53871b952a62607704ea47d6d50e CI 1648348284 +1100 commit (initial): myfile1 +8deea9ab6bed53871b952a62607704ea47d6d50e 309d64f4b30c8a17897642eb8966189d2b054af2 CI 1648348284 +1100 commit: myfile2 +309d64f4b30c8a17897642eb8966189d2b054af2 a16265d00b218b3961405fc0c71a5ec2ffff879e CI 1648348284 +1100 commit: myfile3 +a16265d00b218b3961405fc0c71a5ec2ffff879e 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348284 +1100 commit: myfile4 +83d120ae6a09eeef4e082d1c2cc81aac81075988 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348287 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..cb73b1272 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 8deea9ab6bed53871b952a62607704ea47d6d50e CI 1648348284 +1100 commit (initial): myfile1 +8deea9ab6bed53871b952a62607704ea47d6d50e 309d64f4b30c8a17897642eb8966189d2b054af2 CI 1648348284 +1100 commit: myfile2 +309d64f4b30c8a17897642eb8966189d2b054af2 a16265d00b218b3961405fc0c71a5ec2ffff879e CI 1648348284 +1100 commit: myfile3 +a16265d00b218b3961405fc0c71a5ec2ffff879e 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348284 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/test new file mode 100644 index 000000000..a3f63ea1c --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/heads/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348287 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..3772cf2a7 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 309d64f4b30c8a17897642eb8966189d2b054af2 CI 1648348284 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/test new file mode 100644 index 000000000..30f2a7a42 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/logs/refs/remotes/origin/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 83d120ae6a09eeef4e082d1c2cc81aac81075988 CI 1648348288 +1100 update by push diff --git a/test/integration/pushFollowTags/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushFollowTags/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushFollowTags/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushFollowTags/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushFollowTags/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushFollowTags/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 new file mode 100644 index 000000000..7fbedd38e Binary files /dev/null and b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/30/9d64f4b30c8a17897642eb8966189d2b054af2 differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 new file mode 100644 index 000000000..60b6c9ee5 Binary files /dev/null and b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/83/d120ae6a09eeef4e082d1c2cc81aac81075988 differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e new file mode 100644 index 000000000..5bca7d1d2 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/8d/eea9ab6bed53871b952a62607704ea47d6d50e @@ -0,0 +1,2 @@ +xÍA +ƒ0@Ñ®sŠÙJ&NÇ))¸ò1™PÁ!")ØÛ×#tûyðS5[ ñ¥íªà•Sñ‘çþ¡’‰…³`ˆXzš©ËL%¦{pñÓÞu‡q‚ç8½ôˆ¶­zKÕ@&éH‚\½wg='MÿäξeYÝ4/,Ù \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e new file mode 100644 index 000000000..a80d7de45 Binary files /dev/null and b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a1/6265d00b218b3961405fc0c71a5ec2ffff879e differ diff --git a/test/integration/pushFollowTags/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushFollowTags/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushFollowTags/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushFollowTags/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushWithCredentials/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pushFollowTags/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushFollowTags/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..088420ba8 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/test new file mode 100644 index 000000000..088420ba8 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/heads/test @@ -0,0 +1 @@ +83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..4415813b2 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +309d64f4b30c8a17897642eb8966189d2b054af2 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/test new file mode 100644 index 000000000..088420ba8 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/repo/.git_keep/refs/remotes/origin/test @@ -0,0 +1 @@ +83d120ae6a09eeef4e082d1c2cc81aac81075988 diff --git a/test/integration/pushFollowTags/expected/myfile1 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile1 similarity index 100% rename from test/integration/pushFollowTags/expected/myfile1 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/myfile1 diff --git a/test/integration/pushFollowTags/expected/myfile2 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile2 similarity index 100% rename from test/integration/pushFollowTags/expected/myfile2 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/myfile2 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile3 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile3 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/myfile3 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/myfile3 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile4 b/test/integration/pushAndSetUpstreamDefault/expected/repo/myfile4 similarity index 100% rename from test/integration/pushAndSetUpstreamDefault/expected/myfile4 rename to test/integration/pushAndSetUpstreamDefault/expected/repo/myfile4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/config b/test/integration/pushAndSetUpstreamDefault/expected_remote/config deleted file mode 100644 index 5f4aec3f4..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushAndSetUpstreamDefault/./actual diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 deleted file mode 100644 index 3b028eaf7..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 deleted file mode 100644 index 5e637927f..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d deleted file mode 100644 index d93d894fa..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙJFÇ™¥\yŒ˜L¨à‘ÚÛ×#tûyðS5[ ñ¥ªà•Sñ‘5d"ÅÀ9`±-Ôg¦Óйøn¯zÀ4Ã}šŸú‰¶ozKÕ€ÜSE+¢÷î¬ç¤éŸÜÙ·¬›¢û7,,ë \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 deleted file mode 100644 index bd9a3df16..000000000 Binary files a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 and /dev/null differ diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/packed-refs b/test/integration/pushAndSetUpstreamDefault/expected_remote/packed-refs deleted file mode 100644 index aadce3af8..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -dc7117cc68b23798cabb2c388a45036da33c2f10 refs/heads/master diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected_remote/refs/heads/test deleted file mode 100644 index fcd0d8e35..000000000 --- a/test/integration/pushAndSetUpstreamDefault/expected_remote/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushAndSetUpstreamDefault/setup.sh b/test/integration/pushAndSetUpstreamDefault/setup.sh index 1d5f61ecf..04ec4d860 100644 --- a/test/integration/pushAndSetUpstreamDefault/setup.sh +++ b/test/integration/pushAndSetUpstreamDefault/setup.sh @@ -19,9 +19,9 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo echo test3 > myfile3 git add . @@ -30,6 +30,6 @@ echo test4 > myfile4 git add . git commit -am "myfile4" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git config push.default current diff --git a/test/integration/pushFollowTags/expected/.git_keep/FETCH_HEAD b/test/integration/pushFollowTags/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index eb26084cc..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 branch 'master' of ../actual_remote diff --git a/test/integration/pushFollowTags/expected/.git_keep/index b/test/integration/pushFollowTags/expected/.git_keep/index deleted file mode 100644 index f23548c75..000000000 Binary files a/test/integration/pushFollowTags/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/.git_keep/logs/HEAD b/test/integration/pushFollowTags/expected/.git_keep/logs/HEAD deleted file mode 100644 index 263e15735..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 f27af92910b10e6ddf592fae975337355579464b CI 1634944096 +1100 commit (initial): myfile1 -f27af92910b10e6ddf592fae975337355579464b d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 CI 1634944096 +1100 commit: myfile2 -d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 aea6b2960cc3e7a2453ce3490ca09d090d7ce223 CI 1634944096 +1100 commit: myfile3 diff --git a/test/integration/pushFollowTags/expected/.git_keep/logs/refs/heads/master b/test/integration/pushFollowTags/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 263e15735..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 f27af92910b10e6ddf592fae975337355579464b CI 1634944096 +1100 commit (initial): myfile1 -f27af92910b10e6ddf592fae975337355579464b d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 CI 1634944096 +1100 commit: myfile2 -d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 aea6b2960cc3e7a2453ce3490ca09d090d7ce223 CI 1634944096 +1100 commit: myfile3 diff --git a/test/integration/pushFollowTags/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushFollowTags/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 36306f3d0..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 CI 1634944096 +1100 fetch origin: storing head -d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 aea6b2960cc3e7a2453ce3490ca09d090d7ce223 CI 1634944097 +1100 update by push diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/34/10e6811881ccede9ff762c875f9b99a3e6eaef b/test/integration/pushFollowTags/expected/.git_keep/objects/34/10e6811881ccede9ff762c875f9b99a3e6eaef deleted file mode 100644 index 63ae5ead6..000000000 Binary files a/test/integration/pushFollowTags/expected/.git_keep/objects/34/10e6811881ccede9ff762c875f9b99a3e6eaef and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/ae/a6b2960cc3e7a2453ce3490ca09d090d7ce223 b/test/integration/pushFollowTags/expected/.git_keep/objects/ae/a6b2960cc3e7a2453ce3490ca09d090d7ce223 deleted file mode 100644 index 23f4eb7e8..000000000 Binary files a/test/integration/pushFollowTags/expected/.git_keep/objects/ae/a6b2960cc3e7a2453ce3490ca09d090d7ce223 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/d0/d3bfe09c1a5a9631f3041a184d6b9c6d927c83 b/test/integration/pushFollowTags/expected/.git_keep/objects/d0/d3bfe09c1a5a9631f3041a184d6b9c6d927c83 deleted file mode 100644 index dbbef8c24..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/objects/d0/d3bfe09c1a5a9631f3041a184d6b9c6d927c83 +++ /dev/null @@ -1,4 +0,0 @@ -xÎA -Â0@Q×9Eö‚d’ÉÄ¡«#if°ÐØR"èííÜ~ÞâOkks·Àx껈Í) äÈêjQ&b-èꉪ÷Å©G ³å]^ݪOYÙ3¸N¨Vì5 §B -1ÆÄHXL~÷çºÛa´·a|È'·m‘Ë´¶» -ȈŽÉžœ3G=¦ºüÉMû꼈7?šS9³ \ No newline at end of file diff --git a/test/integration/pushFollowTags/expected/.git_keep/objects/f2/7af92910b10e6ddf592fae975337355579464b b/test/integration/pushFollowTags/expected/.git_keep/objects/f2/7af92910b10e6ddf592fae975337355579464b deleted file mode 100644 index b2353a7c3..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/objects/f2/7af92910b10e6ddf592fae975337355579464b +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙÊŒNÇJ\yŒ˜L¨à")´·×#tûyðS5[Ë¥íª€*©`”eê3³’—ì©‹T^¸ÏÂ%¦{ç⧽êÓ iõí½é-U{IσÀ•Ñõœ4ý“;û•uSr3m,Õ \ No newline at end of file diff --git a/test/integration/pushFollowTags/expected/.git_keep/refs/heads/master b/test/integration/pushFollowTags/expected/.git_keep/refs/heads/master deleted file mode 100644 index 04b4caa25..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -aea6b2960cc3e7a2453ce3490ca09d090d7ce223 diff --git a/test/integration/pushFollowTags/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushFollowTags/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 04b4caa25..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -aea6b2960cc3e7a2453ce3490ca09d090d7ce223 diff --git a/test/integration/pushFollowTags/expected/.git_keep/refs/tags/v1.0 b/test/integration/pushFollowTags/expected/.git_keep/refs/tags/v1.0 deleted file mode 100644 index 9e7dd44c2..000000000 --- a/test/integration/pushFollowTags/expected/.git_keep/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -3410e6811881ccede9ff762c875f9b99a3e6eaef diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/HEAD b/test/integration/pushFollowTags/expected/origin/HEAD similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/HEAD rename to test/integration/pushFollowTags/expected/origin/HEAD diff --git a/test/integration/pushFollowTags/expected/origin/config b/test/integration/pushFollowTags/expected/origin/config new file mode 100644 index 000000000..f285c4f51 --- /dev/null +++ b/test/integration/pushFollowTags/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushFollowTags/actual/./repo diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/description b/test/integration/pushFollowTags/expected/origin/description similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/description rename to test/integration/pushFollowTags/expected/origin/description diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/info/exclude b/test/integration/pushFollowTags/expected/origin/info/exclude similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/info/exclude rename to test/integration/pushFollowTags/expected/origin/info/exclude diff --git a/test/integration/pushFollowTags/expected/origin/objects/03/63748fdf3c7a6947886a53d51208c0866f76af b/test/integration/pushFollowTags/expected/origin/objects/03/63748fdf3c7a6947886a53d51208c0866f76af new file mode 100644 index 000000000..d39af3410 --- /dev/null +++ b/test/integration/pushFollowTags/expected/origin/objects/03/63748fdf3c7a6947886a53d51208c0866f76af @@ -0,0 +1,3 @@ +xŒË +ƒ0E»ÎW̾ ™¤Ig ”‚+?#/ÅÒ±Aêß7Â]œÅ9·º Pñ¥øw +È…£ÒÖùûèYI’rLšÙ°õ†c4¢k‚Prž«¨ícÇNž0¥ úýðJ?—×Oêšõ´7ÒmÒÂQJ!ò{Ú¾sYàlÿÉd'H \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushFollowTags/expected/origin/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 b/test/integration/pushFollowTags/expected/origin/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 new file mode 100644 index 000000000..500e00fd3 Binary files /dev/null and b/test/integration/pushFollowTags/expected/origin/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 differ diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushFollowTags/expected/origin/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 b/test/integration/pushFollowTags/expected/origin/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 new file mode 100644 index 000000000..16d65967d Binary files /dev/null and b/test/integration/pushFollowTags/expected/origin/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 differ diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushFollowTags/expected/origin/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 b/test/integration/pushFollowTags/expected/origin/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 new file mode 100644 index 000000000..2c25bdee4 Binary files /dev/null and b/test/integration/pushFollowTags/expected/origin/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 differ diff --git a/test/integration/pushFollowTags/expected/origin/packed-refs b/test/integration/pushFollowTags/expected/origin/packed-refs new file mode 100644 index 000000000..00ae51cfc --- /dev/null +++ b/test/integration/pushFollowTags/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 refs/heads/master diff --git a/test/integration/pushFollowTags/expected/origin/refs/heads/master b/test/integration/pushFollowTags/expected/origin/refs/heads/master new file mode 100644 index 000000000..e3fe528b1 --- /dev/null +++ b/test/integration/pushFollowTags/expected/origin/refs/heads/master @@ -0,0 +1 @@ +8ac21a1d236ab7fb92c8f8082a98399596b59dd5 diff --git a/test/integration/pushFollowTags/expected/origin/refs/tags/v1.0 b/test/integration/pushFollowTags/expected/origin/refs/tags/v1.0 new file mode 100644 index 000000000..2a626e934 --- /dev/null +++ b/test/integration/pushFollowTags/expected/origin/refs/tags/v1.0 @@ -0,0 +1 @@ +0363748fdf3c7a6947886a53d51208c0866f76af diff --git a/test/integration/pushFollowTags/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pushFollowTags/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pushFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushFollowTags/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..bf5b60915 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 branch 'master' of ../origin diff --git a/test/integration/pushNoFollowTags/expected_remote/HEAD b/test/integration/pushFollowTags/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/HEAD rename to test/integration/pushFollowTags/expected/repo/.git_keep/HEAD diff --git a/test/integration/pushFollowTags/expected/.git_keep/config b/test/integration/pushFollowTags/expected/repo/.git_keep/config similarity index 93% rename from test/integration/pushFollowTags/expected/.git_keep/config rename to test/integration/pushFollowTags/expected/repo/.git_keep/config index 190f2591c..fe5852494 100644 --- a/test/integration/pushFollowTags/expected/.git_keep/config +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/config @@ -9,7 +9,7 @@ email = CI@example.com name = CI [remote "origin"] - url = ../actual_remote + url = ../origin fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/pushNoFollowTags/expected_remote/description b/test/integration/pushFollowTags/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/description rename to test/integration/pushFollowTags/expected/repo/.git_keep/description diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/index b/test/integration/pushFollowTags/expected/repo/.git_keep/index new file mode 100644 index 000000000..9b5fc68b0 Binary files /dev/null and b/test/integration/pushFollowTags/expected/repo/.git_keep/index differ diff --git a/test/integration/pushNoFollowTags/expected_remote/info/exclude b/test/integration/pushFollowTags/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/info/exclude rename to test/integration/pushFollowTags/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/HEAD b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..f9281a9c5 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 bc1bee0a92515554303f848cbdecb4f7bc219e55 CI 1648348306 +1100 commit (initial): myfile1 +bc1bee0a92515554303f848cbdecb4f7bc219e55 f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 CI 1648348306 +1100 commit: myfile2 +f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 8ac21a1d236ab7fb92c8f8082a98399596b59dd5 CI 1648348306 +1100 commit: myfile3 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..f9281a9c5 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 bc1bee0a92515554303f848cbdecb4f7bc219e55 CI 1648348306 +1100 commit (initial): myfile1 +bc1bee0a92515554303f848cbdecb4f7bc219e55 f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 CI 1648348306 +1100 commit: myfile2 +f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 8ac21a1d236ab7fb92c8f8082a98399596b59dd5 CI 1648348306 +1100 commit: myfile3 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..e9c2433a9 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 CI 1648348306 +1100 fetch origin: storing head +f619224ae5e8ac2a5fa8e01624df4ca3d1b50d69 8ac21a1d236ab7fb92c8f8082a98399596b59dd5 CI 1648348307 +1100 update by push diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/03/63748fdf3c7a6947886a53d51208c0866f76af b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/03/63748fdf3c7a6947886a53d51208c0866f76af new file mode 100644 index 000000000..d39af3410 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/03/63748fdf3c7a6947886a53d51208c0866f76af @@ -0,0 +1,3 @@ +xŒË +ƒ0E»ÎW̾ ™¤Ig ”‚+?#/ÅÒ±Aêß7Â]œÅ9·º Pñ¥øw +È…£ÒÖùûèYI’rLšÙ°õ†c4¢k‚Prž«¨ícÇNž0¥ úýðJ?—×Oêšõ´7ÒmÒÂQJ!ò{Ú¾sYàlÿÉd'H \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 new file mode 100644 index 000000000..500e00fd3 Binary files /dev/null and b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/8a/c21a1d236ab7fb92c8f8082a98399596b59dd5 differ diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 new file mode 100644 index 000000000..16d65967d Binary files /dev/null and b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/bc/1bee0a92515554303f848cbdecb4f7bc219e55 differ diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushNoFollowTags/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 new file mode 100644 index 000000000..2c25bdee4 Binary files /dev/null and b/test/integration/pushFollowTags/expected/repo/.git_keep/objects/f6/19224ae5e8ac2a5fa8e01624df4ca3d1b50d69 differ diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/heads/master b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..e3fe528b1 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +8ac21a1d236ab7fb92c8f8082a98399596b59dd5 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..e3fe528b1 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +8ac21a1d236ab7fb92c8f8082a98399596b59dd5 diff --git a/test/integration/pushFollowTags/expected/repo/.git_keep/refs/tags/v1.0 b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/tags/v1.0 new file mode 100644 index 000000000..2a626e934 --- /dev/null +++ b/test/integration/pushFollowTags/expected/repo/.git_keep/refs/tags/v1.0 @@ -0,0 +1 @@ +0363748fdf3c7a6947886a53d51208c0866f76af diff --git a/test/integration/pushNoFollowTags/expected/myfile1 b/test/integration/pushFollowTags/expected/repo/myfile1 similarity index 100% rename from test/integration/pushNoFollowTags/expected/myfile1 rename to test/integration/pushFollowTags/expected/repo/myfile1 diff --git a/test/integration/pushNoFollowTags/expected/myfile2 b/test/integration/pushFollowTags/expected/repo/myfile2 similarity index 100% rename from test/integration/pushNoFollowTags/expected/myfile2 rename to test/integration/pushFollowTags/expected/repo/myfile2 diff --git a/test/integration/pushFollowTags/expected/myfile3 b/test/integration/pushFollowTags/expected/repo/myfile3 similarity index 100% rename from test/integration/pushFollowTags/expected/myfile3 rename to test/integration/pushFollowTags/expected/repo/myfile3 diff --git a/test/integration/pushFollowTags/expected_remote/config b/test/integration/pushFollowTags/expected_remote/config deleted file mode 100644 index a23b4ec0a..000000000 --- a/test/integration/pushFollowTags/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushFollowTags/./actual diff --git a/test/integration/pushFollowTags/expected_remote/objects/34/10e6811881ccede9ff762c875f9b99a3e6eaef b/test/integration/pushFollowTags/expected_remote/objects/34/10e6811881ccede9ff762c875f9b99a3e6eaef deleted file mode 100644 index 63ae5ead6..000000000 Binary files a/test/integration/pushFollowTags/expected_remote/objects/34/10e6811881ccede9ff762c875f9b99a3e6eaef and /dev/null differ diff --git a/test/integration/pushFollowTags/expected_remote/objects/ae/a6b2960cc3e7a2453ce3490ca09d090d7ce223 b/test/integration/pushFollowTags/expected_remote/objects/ae/a6b2960cc3e7a2453ce3490ca09d090d7ce223 deleted file mode 100644 index 23f4eb7e8..000000000 Binary files a/test/integration/pushFollowTags/expected_remote/objects/ae/a6b2960cc3e7a2453ce3490ca09d090d7ce223 and /dev/null differ diff --git a/test/integration/pushFollowTags/expected_remote/objects/d0/d3bfe09c1a5a9631f3041a184d6b9c6d927c83 b/test/integration/pushFollowTags/expected_remote/objects/d0/d3bfe09c1a5a9631f3041a184d6b9c6d927c83 deleted file mode 100644 index dbbef8c24..000000000 --- a/test/integration/pushFollowTags/expected_remote/objects/d0/d3bfe09c1a5a9631f3041a184d6b9c6d927c83 +++ /dev/null @@ -1,4 +0,0 @@ -xÎA -Â0@Q×9Eö‚d’ÉÄ¡«#if°ÐØR"èííÜ~ÞâOkks·Àx껈Í) äÈêjQ&b-èꉪ÷Å©G ³å]^ݪOYÙ3¸N¨Vì5 §B -1ÆÄHXL~÷çºÛa´·a|È'·m‘Ë´¶» -ȈŽÉžœ3G=¦ºüÉMû꼈7?šS9³ \ No newline at end of file diff --git a/test/integration/pushFollowTags/expected_remote/objects/f2/7af92910b10e6ddf592fae975337355579464b b/test/integration/pushFollowTags/expected_remote/objects/f2/7af92910b10e6ddf592fae975337355579464b deleted file mode 100644 index b2353a7c3..000000000 --- a/test/integration/pushFollowTags/expected_remote/objects/f2/7af92910b10e6ddf592fae975337355579464b +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -ƒ0@Ñ®sŠÙÊŒNÇJ\yŒ˜L¨à")´·×#tûyðS5[Ë¥íª€*©`”eê3³’—ì©‹T^¸ÏÂ%¦{ç⧽êÓ iõí½é-U{IσÀ•Ñõœ4ý“;û•uSr3m,Õ \ No newline at end of file diff --git a/test/integration/pushFollowTags/expected_remote/packed-refs b/test/integration/pushFollowTags/expected_remote/packed-refs deleted file mode 100644 index 51ac4766d..000000000 --- a/test/integration/pushFollowTags/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -d0d3bfe09c1a5a9631f3041a184d6b9c6d927c83 refs/heads/master diff --git a/test/integration/pushFollowTags/expected_remote/refs/heads/master b/test/integration/pushFollowTags/expected_remote/refs/heads/master deleted file mode 100644 index 04b4caa25..000000000 --- a/test/integration/pushFollowTags/expected_remote/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -aea6b2960cc3e7a2453ce3490ca09d090d7ce223 diff --git a/test/integration/pushFollowTags/expected_remote/refs/tags/v1.0 b/test/integration/pushFollowTags/expected_remote/refs/tags/v1.0 deleted file mode 100644 index 9e7dd44c2..000000000 --- a/test/integration/pushFollowTags/expected_remote/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -3410e6811881ccede9ff762c875f9b99a3e6eaef diff --git a/test/integration/pushFollowTags/setup.sh b/test/integration/pushFollowTags/setup.sh index 035c9189d..d66aa5419 100644 --- a/test/integration/pushFollowTags/setup.sh +++ b/test/integration/pushFollowTags/setup.sh @@ -19,15 +19,15 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo echo test3 > myfile3 git add . git commit -am "myfile3" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master git config push.followTags true diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/FETCH_HEAD b/test/integration/pushNoFollowTags/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index ce7bd7286..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -8f99b05bf3462e1a797335475bff5fabe3ae9ec5 branch 'master' of ../actual_remote diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/config b/test/integration/pushNoFollowTags/expected/.git_keep/config deleted file mode 100644 index 821803a3e..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../actual_remote - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/index b/test/integration/pushNoFollowTags/expected/.git_keep/index deleted file mode 100644 index 818799f5d..000000000 Binary files a/test/integration/pushNoFollowTags/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/logs/HEAD b/test/integration/pushNoFollowTags/expected/.git_keep/logs/HEAD deleted file mode 100644 index 429f8a7fc..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 fb20b9e96648c61699f9faf3a4383340fefd5f91 CI 1634944114 +1100 commit (initial): myfile1 -fb20b9e96648c61699f9faf3a4383340fefd5f91 8f99b05bf3462e1a797335475bff5fabe3ae9ec5 CI 1634944114 +1100 commit: myfile2 -8f99b05bf3462e1a797335475bff5fabe3ae9ec5 03009ca2af4be2a9bb49206974ce9c97eaa2da23 CI 1634944114 +1100 commit: myfile3 diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/logs/refs/heads/master b/test/integration/pushNoFollowTags/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 429f8a7fc..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 fb20b9e96648c61699f9faf3a4383340fefd5f91 CI 1634944114 +1100 commit (initial): myfile1 -fb20b9e96648c61699f9faf3a4383340fefd5f91 8f99b05bf3462e1a797335475bff5fabe3ae9ec5 CI 1634944114 +1100 commit: myfile2 -8f99b05bf3462e1a797335475bff5fabe3ae9ec5 03009ca2af4be2a9bb49206974ce9c97eaa2da23 CI 1634944114 +1100 commit: myfile3 diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushNoFollowTags/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 42331700f..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 8f99b05bf3462e1a797335475bff5fabe3ae9ec5 CI 1634944115 +1100 fetch origin: storing head -8f99b05bf3462e1a797335475bff5fabe3ae9ec5 03009ca2af4be2a9bb49206974ce9c97eaa2da23 CI 1634944115 +1100 update by push diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/03/009ca2af4be2a9bb49206974ce9c97eaa2da23 b/test/integration/pushNoFollowTags/expected/.git_keep/objects/03/009ca2af4be2a9bb49206974ce9c97eaa2da23 deleted file mode 100644 index 4a4d1b682..000000000 Binary files a/test/integration/pushNoFollowTags/expected/.git_keep/objects/03/009ca2af4be2a9bb49206974ce9c97eaa2da23 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/8f/99b05bf3462e1a797335475bff5fabe3ae9ec5 b/test/integration/pushNoFollowTags/expected/.git_keep/objects/8f/99b05bf3462e1a797335475bff5fabe3ae9ec5 deleted file mode 100644 index 1e525bf69..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/objects/8f/99b05bf3462e1a797335475bff5fabe3ae9ec5 +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -Â0@Q×9ÅìÉ$Ó±"BW=FÒÌ`¡±¥DÐÛÛ#¸ý¼ÅŸÖZç(tj»*¤k$L˜/EÕ„EY,sä>0—²·@ÈnK»¾X>‹ -3õ#‹˜X²˜(ö1’7µÒ™ Kïö\wF¸ ãC?©n‹^¦µÞ9’!œ½wG=¦šþÉ]ýÚ¼hp?Ö:: \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/e1/9bd88e6b3a0d7e4ffc1de39b34d5a312fb9b77 b/test/integration/pushNoFollowTags/expected/.git_keep/objects/e1/9bd88e6b3a0d7e4ffc1de39b34d5a312fb9b77 deleted file mode 100644 index 33f59a1d3..000000000 Binary files a/test/integration/pushNoFollowTags/expected/.git_keep/objects/e1/9bd88e6b3a0d7e4ffc1de39b34d5a312fb9b77 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/objects/fb/20b9e96648c61699f9faf3a4383340fefd5f91 b/test/integration/pushNoFollowTags/expected/.git_keep/objects/fb/20b9e96648c61699f9faf3a4383340fefd5f91 deleted file mode 100644 index 8160387e5..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/objects/fb/20b9e96648c61699f9faf3a4383340fefd5f91 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0Fa×9ÅìÉߎÓD„®zŒ4™`¡C¤DÐÛÛ#¸}|ðR5[åÔvUò*©ø(Ë0jÈÌŠ 9 ‹(/ÜgáÓµsñÝžu§i¦Û4?ôíµé%U»¤ç‘`:Þ»£“¦rgß²n -÷0ˆ,à \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/refs/heads/master b/test/integration/pushNoFollowTags/expected/.git_keep/refs/heads/master deleted file mode 100644 index c5beb70f7..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -03009ca2af4be2a9bb49206974ce9c97eaa2da23 diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushNoFollowTags/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index c5beb70f7..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -03009ca2af4be2a9bb49206974ce9c97eaa2da23 diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/refs/tags/v1.0 b/test/integration/pushNoFollowTags/expected/.git_keep/refs/tags/v1.0 deleted file mode 100644 index b4c9b638f..000000000 --- a/test/integration/pushNoFollowTags/expected/.git_keep/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -e19bd88e6b3a0d7e4ffc1de39b34d5a312fb9b77 diff --git a/test/integration/pushTag/expected/.git_keep/HEAD b/test/integration/pushNoFollowTags/expected/origin/HEAD similarity index 100% rename from test/integration/pushTag/expected/.git_keep/HEAD rename to test/integration/pushNoFollowTags/expected/origin/HEAD diff --git a/test/integration/pushNoFollowTags/expected/origin/config b/test/integration/pushNoFollowTags/expected/origin/config new file mode 100644 index 000000000..67da24ff7 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushNoFollowTags/actual/./repo diff --git a/test/integration/pushTag/expected/.git_keep/description b/test/integration/pushNoFollowTags/expected/origin/description similarity index 100% rename from test/integration/pushTag/expected/.git_keep/description rename to test/integration/pushNoFollowTags/expected/origin/description diff --git a/test/integration/pushTag/expected/.git_keep/info/exclude b/test/integration/pushNoFollowTags/expected/origin/info/exclude similarity index 100% rename from test/integration/pushTag/expected/.git_keep/info/exclude rename to test/integration/pushNoFollowTags/expected/origin/info/exclude diff --git a/test/integration/pushTag/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushNoFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushTag/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushNoFollowTags/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushTag/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushNoFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushTag/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushNoFollowTags/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushNoFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushNoFollowTags/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae b/test/integration/pushNoFollowTags/expected/origin/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae new file mode 100644 index 000000000..60e20345f Binary files /dev/null and b/test/integration/pushNoFollowTags/expected/origin/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae differ diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b b/test/integration/pushNoFollowTags/expected/origin/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b new file mode 100644 index 000000000..db48eb1e2 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/origin/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b @@ -0,0 +1,2 @@ +xŽM +Â0F]çÙ 2?i›‚ˆÐU‘Lg°`l)ôöæÂoñÉVÊZ=ŽáTUO–ØãbÙR`³´ [‰™‘¤ku{:ôU½èˆ q”Ô ;\ˆ´·Ac&Î.½ëc;ü4ûë4ßõ“ÊþÔ‹lå汑Û0ø3"€k¶ªúgîÊ×Ö§²û å: \ No newline at end of file diff --git a/test/integration/pushTag/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushNoFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushTag/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushNoFollowTags/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushTag/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushNoFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushTag/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushNoFollowTags/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushNoFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushNoFollowTags/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushNoFollowTags/expected/origin/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b b/test/integration/pushNoFollowTags/expected/origin/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b new file mode 100644 index 000000000..c6e6187bd Binary files /dev/null and b/test/integration/pushNoFollowTags/expected/origin/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b differ diff --git a/test/integration/pushNoFollowTags/expected/origin/packed-refs b/test/integration/pushNoFollowTags/expected/origin/packed-refs new file mode 100644 index 000000000..04e69c5bf --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +f0ce9150789c4aef204270b5201d22e6f7e8b23b refs/heads/master diff --git a/test/integration/pushNoFollowTags/expected/origin/refs/heads/master b/test/integration/pushNoFollowTags/expected/origin/refs/heads/master new file mode 100644 index 000000000..fc820b89f --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/origin/refs/heads/master @@ -0,0 +1 @@ +4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b diff --git a/test/integration/pushNoFollowTags/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushNoFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pushNoFollowTags/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushNoFollowTags/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..7f07f6234 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +f0ce9150789c4aef204270b5201d22e6f7e8b23b branch 'master' of ../origin diff --git a/test/integration/pushTag/expected_remote/HEAD b/test/integration/pushNoFollowTags/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pushTag/expected_remote/HEAD rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/HEAD diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/config b/test/integration/pushNoFollowTags/expected/repo/.git_keep/config new file mode 100644 index 000000000..7721ae814 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/config @@ -0,0 +1,16 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[remote "origin"] + url = ../origin + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/test/integration/pushTag/expected_remote/description b/test/integration/pushNoFollowTags/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pushTag/expected_remote/description rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/description diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/index b/test/integration/pushNoFollowTags/expected/repo/.git_keep/index new file mode 100644 index 000000000..1c3ab1418 Binary files /dev/null and b/test/integration/pushNoFollowTags/expected/repo/.git_keep/index differ diff --git a/test/integration/pushTag/expected_remote/info/exclude b/test/integration/pushNoFollowTags/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pushTag/expected_remote/info/exclude rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/HEAD b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..36c5ad470 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 32a7825dd9144b755bd2bbefa9f0f75047d53aae CI 1648348314 +1100 commit (initial): myfile1 +32a7825dd9144b755bd2bbefa9f0f75047d53aae f0ce9150789c4aef204270b5201d22e6f7e8b23b CI 1648348314 +1100 commit: myfile2 +f0ce9150789c4aef204270b5201d22e6f7e8b23b 4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b CI 1648348314 +1100 commit: myfile3 diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..36c5ad470 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 32a7825dd9144b755bd2bbefa9f0f75047d53aae CI 1648348314 +1100 commit (initial): myfile1 +32a7825dd9144b755bd2bbefa9f0f75047d53aae f0ce9150789c4aef204270b5201d22e6f7e8b23b CI 1648348314 +1100 commit: myfile2 +f0ce9150789c4aef204270b5201d22e6f7e8b23b 4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b CI 1648348314 +1100 commit: myfile3 diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..2ef4175f7 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 f0ce9150789c4aef204270b5201d22e6f7e8b23b CI 1648348314 +1100 fetch origin: storing head +f0ce9150789c4aef204270b5201d22e6f7e8b23b 4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b CI 1648348315 +1100 update by push diff --git a/test/integration/pushTag/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushTag/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushTag/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushTag/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushWithCredentials/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae new file mode 100644 index 000000000..60e20345f Binary files /dev/null and b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/32/a7825dd9144b755bd2bbefa9f0f75047d53aae differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b new file mode 100644 index 000000000..db48eb1e2 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/4f/7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b @@ -0,0 +1,2 @@ +xŽM +Â0F]çÙ 2?i›‚ˆÐU‘Lg°`l)ôöæÂoñÉVÊZ=ŽáTUO–ØãbÙR`³´ [‰™‘¤ku{:ôU½èˆ q”Ô ;\ˆ´·Ac&Î.½ëc;ü4ûë4ßõ“ÊþÔ‹lå汑Û0ø3"€k¶ªúgîÊ×Ö§²û å: \ No newline at end of file diff --git a/test/integration/pushTag/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushTag/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushTag/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushTag/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/bc/74fd77b84a00637ff1a30dc835d7d9d48e5e16 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/bc/74fd77b84a00637ff1a30dc835d7d9d48e5e16 new file mode 100644 index 000000000..18b8870a4 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/bc/74fd77b84a00637ff1a30dc835d7d9d48e5e16 @@ -0,0 +1,2 @@ +xŒA +ƒ0E»Î)f_“ÆJ)¸ò™8KcÄ©·o„¿x‹÷~ñP{¿d~K(`bZŽè¬wlÙ»02bˆ™ÉÝŒF¢fUŽU ä”æ¢JýØ©Á&Ù àÑ/ùù´~¤©ÖȧëÈÀ•Q©tÀ.ÛwÎ œí,Ž(J \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b new file mode 100644 index 000000000..c6e6187bd Binary files /dev/null and b/test/integration/pushNoFollowTags/expected/repo/.git_keep/objects/f0/ce9150789c4aef204270b5201d22e6f7e8b23b differ diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/heads/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..fc820b89f --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..fc820b89f --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +4f7c2bf086a8b6ba8cdb00cf76dbb18543c4ef3b diff --git a/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/tags/v1.0 b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/tags/v1.0 new file mode 100644 index 000000000..ac64fbcb2 --- /dev/null +++ b/test/integration/pushNoFollowTags/expected/repo/.git_keep/refs/tags/v1.0 @@ -0,0 +1 @@ +bc74fd77b84a00637ff1a30dc835d7d9d48e5e16 diff --git a/test/integration/pushTag/expected/myfile1 b/test/integration/pushNoFollowTags/expected/repo/myfile1 similarity index 100% rename from test/integration/pushTag/expected/myfile1 rename to test/integration/pushNoFollowTags/expected/repo/myfile1 diff --git a/test/integration/pushTag/expected/myfile2 b/test/integration/pushNoFollowTags/expected/repo/myfile2 similarity index 100% rename from test/integration/pushTag/expected/myfile2 rename to test/integration/pushNoFollowTags/expected/repo/myfile2 diff --git a/test/integration/pushNoFollowTags/expected/myfile3 b/test/integration/pushNoFollowTags/expected/repo/myfile3 similarity index 100% rename from test/integration/pushNoFollowTags/expected/myfile3 rename to test/integration/pushNoFollowTags/expected/repo/myfile3 diff --git a/test/integration/pushNoFollowTags/expected_remote/config b/test/integration/pushNoFollowTags/expected_remote/config deleted file mode 100644 index 01095ff3a..000000000 --- a/test/integration/pushNoFollowTags/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushNoFollowTags/./actual diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/03/009ca2af4be2a9bb49206974ce9c97eaa2da23 b/test/integration/pushNoFollowTags/expected_remote/objects/03/009ca2af4be2a9bb49206974ce9c97eaa2da23 deleted file mode 100644 index 4a4d1b682..000000000 Binary files a/test/integration/pushNoFollowTags/expected_remote/objects/03/009ca2af4be2a9bb49206974ce9c97eaa2da23 and /dev/null differ diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/8f/99b05bf3462e1a797335475bff5fabe3ae9ec5 b/test/integration/pushNoFollowTags/expected_remote/objects/8f/99b05bf3462e1a797335475bff5fabe3ae9ec5 deleted file mode 100644 index 1e525bf69..000000000 --- a/test/integration/pushNoFollowTags/expected_remote/objects/8f/99b05bf3462e1a797335475bff5fabe3ae9ec5 +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -Â0@Q×9ÅìÉ$Ó±"BW=FÒÌ`¡±¥DÐÛÛ#¸ý¼ÅŸÖZç(tj»*¤k$L˜/EÕ„EY,sä>0—²·@ÈnK»¾X>‹ -3õ#‹˜X²˜(ö1’7µÒ™ Kïö\wF¸ ãC?©n‹^¦µÞ9’!œ½wG=¦šþÉ]ýÚ¼hp?Ö:: \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected_remote/objects/fb/20b9e96648c61699f9faf3a4383340fefd5f91 b/test/integration/pushNoFollowTags/expected_remote/objects/fb/20b9e96648c61699f9faf3a4383340fefd5f91 deleted file mode 100644 index 8160387e5..000000000 --- a/test/integration/pushNoFollowTags/expected_remote/objects/fb/20b9e96648c61699f9faf3a4383340fefd5f91 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0Fa×9ÅìÉߎÓD„®zŒ4™`¡C¤DÐÛÛ#¸}|ðR5[åÔvUò*©ø(Ë0jÈÌŠ 9 ‹(/ÜgáÓµsñÝžu§i¦Û4?ôíµé%U»¤ç‘`:Þ»£“¦rgß²n -÷0ˆ,à \ No newline at end of file diff --git a/test/integration/pushNoFollowTags/expected_remote/packed-refs b/test/integration/pushNoFollowTags/expected_remote/packed-refs deleted file mode 100644 index cb3f85f2e..000000000 --- a/test/integration/pushNoFollowTags/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -8f99b05bf3462e1a797335475bff5fabe3ae9ec5 refs/heads/master diff --git a/test/integration/pushNoFollowTags/expected_remote/refs/heads/master b/test/integration/pushNoFollowTags/expected_remote/refs/heads/master deleted file mode 100644 index c5beb70f7..000000000 --- a/test/integration/pushNoFollowTags/expected_remote/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -03009ca2af4be2a9bb49206974ce9c97eaa2da23 diff --git a/test/integration/pushNoFollowTags/setup.sh b/test/integration/pushNoFollowTags/setup.sh index b60c4eed4..f8c704295 100644 --- a/test/integration/pushNoFollowTags/setup.sh +++ b/test/integration/pushNoFollowTags/setup.sh @@ -19,15 +19,15 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo echo test3 > myfile3 git add . git commit -am "myfile3" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master git tag -a v1.0 -m "my version 1.0" diff --git a/test/integration/pushTag/expected/.git_keep/FETCH_HEAD b/test/integration/pushTag/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index db4145664..000000000 --- a/test/integration/pushTag/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -5e8100f80934cb3f1530579225107a478afac4ee branch 'master' of ../actual_remote diff --git a/test/integration/pushTag/expected/.git_keep/config b/test/integration/pushTag/expected/.git_keep/config deleted file mode 100644 index 821803a3e..000000000 --- a/test/integration/pushTag/expected/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../actual_remote - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/pushTag/expected/.git_keep/index b/test/integration/pushTag/expected/.git_keep/index deleted file mode 100644 index 4ad50a104..000000000 Binary files a/test/integration/pushTag/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pushTag/expected/.git_keep/logs/HEAD b/test/integration/pushTag/expected/.git_keep/logs/HEAD deleted file mode 100644 index 6b662a0c2..000000000 --- a/test/integration/pushTag/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f5e0cf8631fc56de2f374ef60e123a2b643381e5 CI 1641183988 +1100 commit (initial): myfile1 -f5e0cf8631fc56de2f374ef60e123a2b643381e5 5e8100f80934cb3f1530579225107a478afac4ee CI 1641183988 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/.git_keep/logs/refs/heads/master b/test/integration/pushTag/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 6b662a0c2..000000000 --- a/test/integration/pushTag/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f5e0cf8631fc56de2f374ef60e123a2b643381e5 CI 1641183988 +1100 commit (initial): myfile1 -f5e0cf8631fc56de2f374ef60e123a2b643381e5 5e8100f80934cb3f1530579225107a478afac4ee CI 1641183988 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushTag/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 3509e2c88..000000000 --- a/test/integration/pushTag/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5e8100f80934cb3f1530579225107a478afac4ee CI 1641183988 +1100 fetch origin: storing head diff --git a/test/integration/pushTag/expected/.git_keep/objects/5e/8100f80934cb3f1530579225107a478afac4ee b/test/integration/pushTag/expected/.git_keep/objects/5e/8100f80934cb3f1530579225107a478afac4ee deleted file mode 100644 index bcbc6ef2b..000000000 Binary files a/test/integration/pushTag/expected/.git_keep/objects/5e/8100f80934cb3f1530579225107a478afac4ee and /dev/null differ diff --git a/test/integration/pushTag/expected/.git_keep/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 b/test/integration/pushTag/expected/.git_keep/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 deleted file mode 100644 index 647bf5fc7..000000000 --- a/test/integration/pushTag/expected/.git_keep/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -Â@ @Q×sŠì™´1MADèªÇHg2Xh)#èííÜ~üTÝ×H|j»DãT¢ò2Œ&™ÈP8 vŠe …úÌT4]» ïö¬;L3ܦùaõ×f—TýÈ„(ý(gÄÃQI³?yðoY7Ãð46,Û \ No newline at end of file diff --git a/test/integration/pushTag/expected/.git_keep/refs/heads/master b/test/integration/pushTag/expected/.git_keep/refs/heads/master deleted file mode 100644 index eb5effc80..000000000 --- a/test/integration/pushTag/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushTag/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushTag/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index eb5effc80..000000000 --- a/test/integration/pushTag/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushTag/expected/.git_keep/refs/tags/v1.0 b/test/integration/pushTag/expected/.git_keep/refs/tags/v1.0 deleted file mode 100644 index eb5effc80..000000000 --- a/test/integration/pushTag/expected/.git_keep/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushWithCredentials/expected/.git_keep/HEAD b/test/integration/pushTag/expected/origin/HEAD similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/HEAD rename to test/integration/pushTag/expected/origin/HEAD diff --git a/test/integration/fetchPrune/expected_remote/config b/test/integration/pushTag/expected/origin/config similarity index 79% rename from test/integration/fetchPrune/expected_remote/config rename to test/integration/pushTag/expected/origin/config index 0c3c56578..322981408 100644 --- a/test/integration/fetchPrune/expected_remote/config +++ b/test/integration/pushTag/expected/origin/config @@ -5,4 +5,4 @@ ignorecase = true precomposeunicode = true [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/fetchPrune/./actual + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushTag/actual/./repo diff --git a/test/integration/pushWithCredentials/expected/.git_keep/description b/test/integration/pushTag/expected/origin/description similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/description rename to test/integration/pushTag/expected/origin/description diff --git a/test/integration/pushWithCredentials/expected/.git_keep/info/exclude b/test/integration/pushTag/expected/origin/info/exclude similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/info/exclude rename to test/integration/pushTag/expected/origin/info/exclude diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushTag/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushTag/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushTag/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushTag/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushTag/expected/origin/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 b/test/integration/pushTag/expected/origin/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 new file mode 100644 index 000000000..e3bebf789 Binary files /dev/null and b/test/integration/pushTag/expected/origin/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 differ diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushTag/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushTag/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushTag/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushTag/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushTag/expected/origin/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 b/test/integration/pushTag/expected/origin/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 new file mode 100644 index 000000000..667d1eb35 --- /dev/null +++ b/test/integration/pushTag/expected/origin/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 @@ -0,0 +1,2 @@ +xŽM +Â0F]çÙ ’ùÉÔ€ˆÐU‘¶3Xhl)ôöæÂÇ[<Þ⛶R–ê!ñ©ª>wÄc²0Ϫ–$©$…äŠ"3â ÄíùÐWõ™;TÆ(¦<*)HŒ4s´5 ‘ËïúÜßþÖý䲯z™¶r÷ |¥6ìü ×l;UõÏÜ•¯-«¢û‡9Ä \ No newline at end of file diff --git a/test/integration/pushTag/expected/origin/packed-refs b/test/integration/pushTag/expected/origin/packed-refs new file mode 100644 index 000000000..97e7bbf20 --- /dev/null +++ b/test/integration/pushTag/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +f4d17a0fe9700c664eb4227b5992a4117c481eb4 refs/heads/master diff --git a/test/integration/pushTag/expected/origin/refs/tags/v1.0 b/test/integration/pushTag/expected/origin/refs/tags/v1.0 new file mode 100644 index 000000000..4e9f606c9 --- /dev/null +++ b/test/integration/pushTag/expected/origin/refs/tags/v1.0 @@ -0,0 +1 @@ +f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushTag/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushTag/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/pushTag/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pushTag/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pushTag/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushTag/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..073a60063 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +f4d17a0fe9700c664eb4227b5992a4117c481eb4 branch 'master' of ../origin diff --git a/test/integration/pushWithCredentials/expected_remote/HEAD b/test/integration/pushTag/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/HEAD rename to test/integration/pushTag/expected/repo/.git_keep/HEAD diff --git a/test/integration/pushTag/expected/repo/.git_keep/config b/test/integration/pushTag/expected/repo/.git_keep/config new file mode 100644 index 000000000..7721ae814 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/config @@ -0,0 +1,16 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[remote "origin"] + url = ../origin + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/test/integration/pushWithCredentials/expected_remote/description b/test/integration/pushTag/expected/repo/.git_keep/description similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/description rename to test/integration/pushTag/expected/repo/.git_keep/description diff --git a/test/integration/pushTag/expected/repo/.git_keep/index b/test/integration/pushTag/expected/repo/.git_keep/index new file mode 100644 index 000000000..318501c8d Binary files /dev/null and b/test/integration/pushTag/expected/repo/.git_keep/index differ diff --git a/test/integration/pushWithCredentials/expected_remote/info/exclude b/test/integration/pushTag/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/info/exclude rename to test/integration/pushTag/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pushTag/expected/repo/.git_keep/logs/HEAD b/test/integration/pushTag/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..66ae6fb77 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 a472e4256e0cabe433e1655f13d45f5093f502f3 CI 1648348327 +1100 commit (initial): myfile1 +a472e4256e0cabe433e1655f13d45f5093f502f3 f4d17a0fe9700c664eb4227b5992a4117c481eb4 CI 1648348327 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushTag/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..66ae6fb77 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 a472e4256e0cabe433e1655f13d45f5093f502f3 CI 1648348327 +1100 commit (initial): myfile1 +a472e4256e0cabe433e1655f13d45f5093f502f3 f4d17a0fe9700c664eb4227b5992a4117c481eb4 CI 1648348327 +1100 commit: myfile2 diff --git a/test/integration/pushTag/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushTag/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..1e8c40120 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f4d17a0fe9700c664eb4227b5992a4117c481eb4 CI 1648348327 +1100 fetch origin: storing head diff --git a/test/integration/pushWithCredentials/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushTag/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushTag/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pushWithCredentials/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushTag/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushTag/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 b/test/integration/pushTag/expected/repo/.git_keep/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 new file mode 100644 index 000000000..e3bebf789 Binary files /dev/null and b/test/integration/pushTag/expected/repo/.git_keep/objects/a4/72e4256e0cabe433e1655f13d45f5093f502f3 differ diff --git a/test/integration/pushWithCredentials/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushTag/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushTag/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pushWithCredentials/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushTag/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushTag/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushTag/expected/repo/.git_keep/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 b/test/integration/pushTag/expected/repo/.git_keep/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 new file mode 100644 index 000000000..667d1eb35 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/objects/f4/d17a0fe9700c664eb4227b5992a4117c481eb4 @@ -0,0 +1,2 @@ +xŽM +Â0F]çÙ ’ùÉÔ€ˆÐU‘¶3Xhl)ôöæÂÇ[<Þ⛶R–ê!ñ©ª>wÄc²0Ϫ–$©$…äŠ"3â ÄíùÐWõ™;TÆ(¦<*)HŒ4s´5 ‘ËïúÜßþÖý䲯z™¶r÷ |¥6ìü ×l;UõÏÜ•¯-«¢û‡9Ä \ No newline at end of file diff --git a/test/integration/pushTag/expected/repo/.git_keep/refs/heads/master b/test/integration/pushTag/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..4e9f606c9 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushTag/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushTag/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..4e9f606c9 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushTag/expected/repo/.git_keep/refs/tags/v1.0 b/test/integration/pushTag/expected/repo/.git_keep/refs/tags/v1.0 new file mode 100644 index 000000000..4e9f606c9 --- /dev/null +++ b/test/integration/pushTag/expected/repo/.git_keep/refs/tags/v1.0 @@ -0,0 +1 @@ +f4d17a0fe9700c664eb4227b5992a4117c481eb4 diff --git a/test/integration/pushWithCredentials/expected/myfile1 b/test/integration/pushTag/expected/repo/myfile1 similarity index 100% rename from test/integration/pushWithCredentials/expected/myfile1 rename to test/integration/pushTag/expected/repo/myfile1 diff --git a/test/integration/pushWithCredentials/expected/myfile2 b/test/integration/pushTag/expected/repo/myfile2 similarity index 100% rename from test/integration/pushWithCredentials/expected/myfile2 rename to test/integration/pushTag/expected/repo/myfile2 diff --git a/test/integration/pushTag/expected_remote/config b/test/integration/pushTag/expected_remote/config deleted file mode 100644 index 6b41174e6..000000000 --- a/test/integration/pushTag/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushTag/./actual diff --git a/test/integration/pushTag/expected_remote/objects/5e/8100f80934cb3f1530579225107a478afac4ee b/test/integration/pushTag/expected_remote/objects/5e/8100f80934cb3f1530579225107a478afac4ee deleted file mode 100644 index bcbc6ef2b..000000000 Binary files a/test/integration/pushTag/expected_remote/objects/5e/8100f80934cb3f1530579225107a478afac4ee and /dev/null differ diff --git a/test/integration/pushTag/expected_remote/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 b/test/integration/pushTag/expected_remote/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 deleted file mode 100644 index 647bf5fc7..000000000 --- a/test/integration/pushTag/expected_remote/objects/f5/e0cf8631fc56de2f374ef60e123a2b643381e5 +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -Â@ @Q×sŠì™´1MADèªÇHg2Xh)#èííÜ~üTÝ×H|j»DãT¢ò2Œ&™ÈP8 vŠe …úÌT4]» ïö¬;L3ܦùaõ×f—TýÈ„(ý(gÄÃQI³?yðoY7Ãð46,Û \ No newline at end of file diff --git a/test/integration/pushTag/expected_remote/packed-refs b/test/integration/pushTag/expected_remote/packed-refs deleted file mode 100644 index b71ee5976..000000000 --- a/test/integration/pushTag/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -5e8100f80934cb3f1530579225107a478afac4ee refs/heads/master diff --git a/test/integration/pushTag/expected_remote/refs/tags/v1.0 b/test/integration/pushTag/expected_remote/refs/tags/v1.0 deleted file mode 100644 index eb5effc80..000000000 --- a/test/integration/pushTag/expected_remote/refs/tags/v1.0 +++ /dev/null @@ -1 +0,0 @@ -5e8100f80934cb3f1530579225107a478afac4ee diff --git a/test/integration/pushTag/setup.sh b/test/integration/pushTag/setup.sh index cf6270c03..beedd6ad7 100644 --- a/test/integration/pushTag/setup.sh +++ b/test/integration/pushTag/setup.sh @@ -19,10 +19,10 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master diff --git a/test/integration/pushWithCredentials/expected/.git_keep/FETCH_HEAD b/test/integration/pushWithCredentials/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 6832209cd..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -ff7015f162da19450f2eaf0fc24987104df30e15 branch 'master' of ../actual_remote diff --git a/test/integration/pushWithCredentials/expected/.git_keep/config b/test/integration/pushWithCredentials/expected/.git_keep/config deleted file mode 100644 index 821803a3e..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../actual_remote - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/pushWithCredentials/expected/.git_keep/index b/test/integration/pushWithCredentials/expected/.git_keep/index deleted file mode 100644 index 9e081cf47..000000000 Binary files a/test/integration/pushWithCredentials/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/.git_keep/logs/HEAD b/test/integration/pushWithCredentials/expected/.git_keep/logs/HEAD deleted file mode 100644 index 27c049707..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 ba8cb1da2a48c38706b15552877d79e8745c4bff CI 1641689920 +1100 commit (initial): myfile1 -ba8cb1da2a48c38706b15552877d79e8745c4bff ff7015f162da19450f2eaf0fc24987104df30e15 CI 1641689920 +1100 commit: myfile2 -ff7015f162da19450f2eaf0fc24987104df30e15 d9ea8db22c1655e9861309cc97139357d20e4e64 CI 1641689920 +1100 commit: myfile3 -d9ea8db22c1655e9861309cc97139357d20e4e64 75c50688e5a8e48a00d1a824124221bcc6aad640 CI 1641689920 +1100 commit: myfile4 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/logs/refs/heads/master b/test/integration/pushWithCredentials/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 27c049707..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 ba8cb1da2a48c38706b15552877d79e8745c4bff CI 1641689920 +1100 commit (initial): myfile1 -ba8cb1da2a48c38706b15552877d79e8745c4bff ff7015f162da19450f2eaf0fc24987104df30e15 CI 1641689920 +1100 commit: myfile2 -ff7015f162da19450f2eaf0fc24987104df30e15 d9ea8db22c1655e9861309cc97139357d20e4e64 CI 1641689920 +1100 commit: myfile3 -d9ea8db22c1655e9861309cc97139357d20e4e64 75c50688e5a8e48a00d1a824124221bcc6aad640 CI 1641689920 +1100 commit: myfile4 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushWithCredentials/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 463f9add6..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 ff7015f162da19450f2eaf0fc24987104df30e15 CI 1641689920 +1100 fetch origin: storing head -ff7015f162da19450f2eaf0fc24987104df30e15 75c50688e5a8e48a00d1a824124221bcc6aad640 CI 1641689925 +1100 update by push diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/75/c50688e5a8e48a00d1a824124221bcc6aad640 b/test/integration/pushWithCredentials/expected/.git_keep/objects/75/c50688e5a8e48a00d1a824124221bcc6aad640 deleted file mode 100644 index 53b925279..000000000 Binary files a/test/integration/pushWithCredentials/expected/.git_keep/objects/75/c50688e5a8e48a00d1a824124221bcc6aad640 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/ba/8cb1da2a48c38706b15552877d79e8745c4bff b/test/integration/pushWithCredentials/expected/.git_keep/objects/ba/8cb1da2a48c38706b15552877d79e8745c4bff deleted file mode 100644 index e6612ab16..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/objects/ba/8cb1da2a48c38706b15552877d79e8745c4bff +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -Â0@Q×9Å왉ã4¡«#M&XèR"èííÜ~üÜÌ–Ärê»* J®˜d¢†Â¬¤ò‰êÀ3_‹pMùæ]z÷WÛaœà>NOý$ÛV½äf a’£G8!º£“®rgߺ¬Jî3,Õ \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/d9/ea8db22c1655e9861309cc97139357d20e4e64 b/test/integration/pushWithCredentials/expected/.git_keep/objects/d9/ea8db22c1655e9861309cc97139357d20e4e64 deleted file mode 100644 index 16633475a..000000000 Binary files a/test/integration/pushWithCredentials/expected/.git_keep/objects/d9/ea8db22c1655e9861309cc97139357d20e4e64 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/ff/7015f162da19450f2eaf0fc24987104df30e15 b/test/integration/pushWithCredentials/expected/.git_keep/objects/ff/7015f162da19450f2eaf0fc24987104df30e15 deleted file mode 100644 index c79143577..000000000 Binary files a/test/integration/pushWithCredentials/expected/.git_keep/objects/ff/7015f162da19450f2eaf0fc24987104df30e15 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected/.git_keep/refs/heads/master b/test/integration/pushWithCredentials/expected/.git_keep/refs/heads/master deleted file mode 100644 index b3746d069..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -75c50688e5a8e48a00d1a824124221bcc6aad640 diff --git a/test/integration/pushWithCredentials/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushWithCredentials/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index b3746d069..000000000 --- a/test/integration/pushWithCredentials/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -75c50688e5a8e48a00d1a824124221bcc6aad640 diff --git a/test/integration/rebase/expected/.git_keep/HEAD b/test/integration/pushWithCredentials/expected/origin/HEAD similarity index 100% rename from test/integration/rebase/expected/.git_keep/HEAD rename to test/integration/pushWithCredentials/expected/origin/HEAD diff --git a/test/integration/pushWithCredentials/expected/origin/config b/test/integration/pushWithCredentials/expected/origin/config new file mode 100644 index 000000000..97d87029a --- /dev/null +++ b/test/integration/pushWithCredentials/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushWithCredentials/actual/./repo diff --git a/test/integration/rebase/expected/.git_keep/description b/test/integration/pushWithCredentials/expected/origin/description similarity index 100% rename from test/integration/rebase/expected/.git_keep/description rename to test/integration/pushWithCredentials/expected/origin/description diff --git a/test/integration/rebase/expected/.git_keep/info/exclude b/test/integration/pushWithCredentials/expected/origin/info/exclude similarity index 100% rename from test/integration/rebase/expected/.git_keep/info/exclude rename to test/integration/pushWithCredentials/expected/origin/info/exclude diff --git a/test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushWithCredentials/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushWithCredentials/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/rebase/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushWithCredentials/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushWithCredentials/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushWithCredentials/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushWithCredentials/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushWithCredentials/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushWithCredentials/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pushWithCredentials/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pushWithCredentials/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pushWithCredentials/expected/origin/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 b/test/integration/pushWithCredentials/expected/origin/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 new file mode 100644 index 000000000..9a7993c8a --- /dev/null +++ b/test/integration/pushWithCredentials/expected/origin/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 @@ -0,0 +1,2 @@ +xŽA +Â0E]çÙ 2“IÚ"BW=F2™ÁBcK‰ ·7GpõáóøïóVëÒ,^ý©"Öe‰ã€E=‘&Oª© iŽ™ÐqèÉbötÈ«ÙcHI!ÂP0sˆ9#¸+ŽnÔ±o‘Wؤw{n‡f{›æ‡|RÝW¹ðVïÉw'Ú3"€ém?ÕäOÜÔ¯.«ùóï:W \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected/origin/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc b/test/integration/pushWithCredentials/expected/origin/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc new file mode 100644 index 000000000..7ac5bf63c Binary files /dev/null and b/test/integration/pushWithCredentials/expected/origin/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc differ diff --git a/test/integration/pushWithCredentials/expected/origin/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c b/test/integration/pushWithCredentials/expected/origin/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c new file mode 100644 index 000000000..efbdd8e6b Binary files /dev/null and b/test/integration/pushWithCredentials/expected/origin/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c differ diff --git a/test/integration/rebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushWithCredentials/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushWithCredentials/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushWithCredentials/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushWithCredentials/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushWithCredentials/expected/origin/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 b/test/integration/pushWithCredentials/expected/origin/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 new file mode 100644 index 000000000..a711ed381 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/origin/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9ÅìÉd&“D„®zŒ4`ÁØR"èííÜ~Þâ—µµ¥&>õ]\ l½¥h™bEžPÄÇL^4ˆcò%û„fË»¾:&t%ðTBqæj‹w˜k UNäæ QPL~÷ǺÃ0ÂuïúÉm{ꥬí(‰…pF´Öõ˜êú'7í[—§²ùÚF8Í \ No newline at end of file diff --git a/test/integration/rebase2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushWithCredentials/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pushWithCredentials/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/rebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushWithCredentials/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushWithCredentials/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushWithCredentials/expected/origin/packed-refs b/test/integration/pushWithCredentials/expected/origin/packed-refs new file mode 100644 index 000000000..a8749c608 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +5b85aaf0806d1bc5830bb10291727f773c3402dc refs/heads/master diff --git a/test/integration/pushWithCredentials/expected/origin/refs/heads/master b/test/integration/pushWithCredentials/expected/origin/refs/heads/master new file mode 100644 index 000000000..12e3ae0c7 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/origin/refs/heads/master @@ -0,0 +1 @@ +d108cb97213835c25d44e14d167e7c5b48f94ce2 diff --git a/test/integration/setUpstream/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushWithCredentials/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/pushWithCredentials/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pushWithCredentials/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..bfa52698e --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +5b85aaf0806d1bc5830bb10291727f773c3402dc branch 'master' of ../origin diff --git a/test/integration/rebase2/expected/.git_keep/HEAD b/test/integration/pushWithCredentials/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rebase2/expected/.git_keep/HEAD rename to test/integration/pushWithCredentials/expected/repo/.git_keep/HEAD diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/config b/test/integration/pushWithCredentials/expected/repo/.git_keep/config new file mode 100644 index 000000000..7721ae814 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/config @@ -0,0 +1,16 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[remote "origin"] + url = ../origin + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/test/integration/rebase2/expected/.git_keep/description b/test/integration/pushWithCredentials/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rebase2/expected/.git_keep/description rename to test/integration/pushWithCredentials/expected/repo/.git_keep/description diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/index b/test/integration/pushWithCredentials/expected/repo/.git_keep/index new file mode 100644 index 000000000..0c9add5d7 Binary files /dev/null and b/test/integration/pushWithCredentials/expected/repo/.git_keep/index differ diff --git a/test/integration/rebase2/expected/.git_keep/info/exclude b/test/integration/pushWithCredentials/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rebase2/expected/.git_keep/info/exclude rename to test/integration/pushWithCredentials/expected/repo/.git_keep/info/exclude diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/HEAD b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..238148235 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 5d98350a913b48a35001ff9b54335f065b25fd7c CI 1648348611 +1100 commit (initial): myfile1 +5d98350a913b48a35001ff9b54335f065b25fd7c 5b85aaf0806d1bc5830bb10291727f773c3402dc CI 1648348611 +1100 commit: myfile2 +5b85aaf0806d1bc5830bb10291727f773c3402dc 3e912c74bc7c237df0c521aff7b3f4932d7e8616 CI 1648348611 +1100 commit: myfile3 +3e912c74bc7c237df0c521aff7b3f4932d7e8616 d108cb97213835c25d44e14d167e7c5b48f94ce2 CI 1648348611 +1100 commit: myfile4 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..238148235 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 5d98350a913b48a35001ff9b54335f065b25fd7c CI 1648348611 +1100 commit (initial): myfile1 +5d98350a913b48a35001ff9b54335f065b25fd7c 5b85aaf0806d1bc5830bb10291727f773c3402dc CI 1648348611 +1100 commit: myfile2 +5b85aaf0806d1bc5830bb10291727f773c3402dc 3e912c74bc7c237df0c521aff7b3f4932d7e8616 CI 1648348611 +1100 commit: myfile3 +3e912c74bc7c237df0c521aff7b3f4932d7e8616 d108cb97213835c25d44e14d167e7c5b48f94ce2 CI 1648348611 +1100 commit: myfile4 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..a55b9f3a9 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 5b85aaf0806d1bc5830bb10291727f773c3402dc CI 1648348611 +1100 fetch origin: storing head +5b85aaf0806d1bc5830bb10291727f773c3402dc d108cb97213835c25d44e14d167e7c5b48f94ce2 CI 1648348616 +1100 update by push diff --git a/test/integration/setUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/rebase2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pushWithCredentials/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/pushWithCredentials/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 new file mode 100644 index 000000000..9a7993c8a --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/3e/912c74bc7c237df0c521aff7b3f4932d7e8616 @@ -0,0 +1,2 @@ +xŽA +Â0E]çÙ 2“IÚ"BW=F2™ÁBcK‰ ·7GpõáóøïóVëÒ,^ý©"Öe‰ã€E=‘&Oª© iŽ™ÐqèÉbötÈ«ÙcHI!ÂP0sˆ9#¸+ŽnÔ±o‘Wؤw{n‡f{›æ‡|RÝW¹ðVïÉw'Ú3"€ém?ÕäOÜÔ¯.«ùóï:W \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc new file mode 100644 index 000000000..7ac5bf63c Binary files /dev/null and b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5b/85aaf0806d1bc5830bb10291727f773c3402dc differ diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c new file mode 100644 index 000000000..efbdd8e6b Binary files /dev/null and b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/5d/98350a913b48a35001ff9b54335f065b25fd7c differ diff --git a/test/integration/rebase2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 new file mode 100644 index 000000000..a711ed381 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d1/08cb97213835c25d44e14d167e7c5b48f94ce2 @@ -0,0 +1,2 @@ +xÎA +Â0@Q×9ÅìÉd&“D„®zŒ4`ÁØR"èííÜ~Þâ—µµ¥&>õ]\ l½¥h™bEžPÄÇL^4ˆcò%û„fË»¾:&t%ðTBqæj‹w˜k UNäæ QPL~÷ǺÃ0ÂuïúÉm{ꥬí(‰…pF´Öõ˜êú'7í[—§²ùÚF8Í \ No newline at end of file diff --git a/test/integration/rebase3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/rebase2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushWithCredentials/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/pushWithCredentials/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/heads/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..12e3ae0c7 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +d108cb97213835c25d44e14d167e7c5b48f94ce2 diff --git a/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..12e3ae0c7 --- /dev/null +++ b/test/integration/pushWithCredentials/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +d108cb97213835c25d44e14d167e7c5b48f94ce2 diff --git a/test/integration/searching/expected/myfile1 b/test/integration/pushWithCredentials/expected/repo/myfile1 similarity index 100% rename from test/integration/searching/expected/myfile1 rename to test/integration/pushWithCredentials/expected/repo/myfile1 diff --git a/test/integration/setUpstream/expected/myfile2 b/test/integration/pushWithCredentials/expected/repo/myfile2 similarity index 100% rename from test/integration/setUpstream/expected/myfile2 rename to test/integration/pushWithCredentials/expected/repo/myfile2 diff --git a/test/integration/pushWithCredentials/expected/myfile3 b/test/integration/pushWithCredentials/expected/repo/myfile3 similarity index 100% rename from test/integration/pushWithCredentials/expected/myfile3 rename to test/integration/pushWithCredentials/expected/repo/myfile3 diff --git a/test/integration/pushWithCredentials/expected/myfile4 b/test/integration/pushWithCredentials/expected/repo/myfile4 similarity index 100% rename from test/integration/pushWithCredentials/expected/myfile4 rename to test/integration/pushWithCredentials/expected/repo/myfile4 diff --git a/test/integration/pushWithCredentials/expected_remote/config b/test/integration/pushWithCredentials/expected_remote/config deleted file mode 100644 index c498610f7..000000000 --- a/test/integration/pushWithCredentials/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushWithCredentials/./actual diff --git a/test/integration/pushWithCredentials/expected_remote/objects/75/c50688e5a8e48a00d1a824124221bcc6aad640 b/test/integration/pushWithCredentials/expected_remote/objects/75/c50688e5a8e48a00d1a824124221bcc6aad640 deleted file mode 100644 index 53b925279..000000000 Binary files a/test/integration/pushWithCredentials/expected_remote/objects/75/c50688e5a8e48a00d1a824124221bcc6aad640 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected_remote/objects/ba/8cb1da2a48c38706b15552877d79e8745c4bff b/test/integration/pushWithCredentials/expected_remote/objects/ba/8cb1da2a48c38706b15552877d79e8745c4bff deleted file mode 100644 index e6612ab16..000000000 --- a/test/integration/pushWithCredentials/expected_remote/objects/ba/8cb1da2a48c38706b15552877d79e8745c4bff +++ /dev/null @@ -1,2 +0,0 @@ -xÍA -Â0@Q×9Å왉ã4¡«#M&XèR"èííÜ~üÜÌ–Ärê»* J®˜d¢†Â¬¤ò‰êÀ3_‹pMùæ]z÷WÛaœà>NOý$ÛV½äf a’£G8!º£“®rgߺ¬Jî3,Õ \ No newline at end of file diff --git a/test/integration/pushWithCredentials/expected_remote/objects/d9/ea8db22c1655e9861309cc97139357d20e4e64 b/test/integration/pushWithCredentials/expected_remote/objects/d9/ea8db22c1655e9861309cc97139357d20e4e64 deleted file mode 100644 index 16633475a..000000000 Binary files a/test/integration/pushWithCredentials/expected_remote/objects/d9/ea8db22c1655e9861309cc97139357d20e4e64 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected_remote/objects/ff/7015f162da19450f2eaf0fc24987104df30e15 b/test/integration/pushWithCredentials/expected_remote/objects/ff/7015f162da19450f2eaf0fc24987104df30e15 deleted file mode 100644 index c79143577..000000000 Binary files a/test/integration/pushWithCredentials/expected_remote/objects/ff/7015f162da19450f2eaf0fc24987104df30e15 and /dev/null differ diff --git a/test/integration/pushWithCredentials/expected_remote/packed-refs b/test/integration/pushWithCredentials/expected_remote/packed-refs deleted file mode 100644 index 66cf8b589..000000000 --- a/test/integration/pushWithCredentials/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -ff7015f162da19450f2eaf0fc24987104df30e15 refs/heads/master diff --git a/test/integration/pushWithCredentials/expected_remote/refs/heads/master b/test/integration/pushWithCredentials/expected_remote/refs/heads/master deleted file mode 100644 index b3746d069..000000000 --- a/test/integration/pushWithCredentials/expected_remote/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -75c50688e5a8e48a00d1a824124221bcc6aad640 diff --git a/test/integration/pushWithCredentials/setup.sh b/test/integration/pushWithCredentials/setup.sh index d39a13d5a..c3fccb5da 100644 --- a/test/integration/pushWithCredentials/setup.sh +++ b/test/integration/pushWithCredentials/setup.sh @@ -19,9 +19,9 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo echo test3 > myfile3 git add . @@ -30,10 +30,10 @@ echo test4 > myfile4 git add . git commit -am "myfile4" -git remote add origin ../actual_remote +git remote add origin ../origin git fetch origin git branch --set-upstream-to=origin/master master # actually getting a password prompt is tricky: it requires SSH'ing into localhost under a newly created, restricted, user. This is not easy to do in a cross-platform way, nor is it easy to do in a docker container. If you can think of a way to do it, please let me know! -cp ../../../hooks/pre-push .git/hooks/pre-push +cp ../../../../hooks/pre-push .git/hooks/pre-push chmod +x .git/hooks/pre-push diff --git a/test/integration/rebase/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebase/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebase/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebase/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebase/expected/.git_keep/FETCH_HEAD b/test/integration/rebase/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebase/expected/.git_keep/FETCH_HEAD rename to test/integration/rebase/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/rebase3/expected/.git_keep/HEAD b/test/integration/rebase/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rebase3/expected/.git_keep/HEAD rename to test/integration/rebase/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebase/expected/.git_keep/ORIG_HEAD b/test/integration/rebase/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/rebase/expected/.git_keep/ORIG_HEAD rename to test/integration/rebase/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/rebase/expected/.git_keep/config b/test/integration/rebase/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebase/expected/.git_keep/config rename to test/integration/rebase/expected/repo/.git_keep/config diff --git a/test/integration/rebase3/expected/.git_keep/description b/test/integration/rebase/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rebase3/expected/.git_keep/description rename to test/integration/rebase/expected/repo/.git_keep/description diff --git a/test/integration/rebase/expected/.git_keep/index b/test/integration/rebase/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebase/expected/.git_keep/index rename to test/integration/rebase/expected/repo/.git_keep/index diff --git a/test/integration/rebase3/expected/.git_keep/info/exclude b/test/integration/rebase/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rebase3/expected/.git_keep/info/exclude rename to test/integration/rebase/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebase/expected/.git_keep/logs/HEAD b/test/integration/rebase/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebase/expected/.git_keep/logs/HEAD rename to test/integration/rebase/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebase/expected/.git_keep/logs/refs/heads/master b/test/integration/rebase/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebase/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebase/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebase3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebase/expected/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf b/test/integration/rebase/expected/repo/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf rename to test/integration/rebase/expected/repo/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf diff --git a/test/integration/rebase/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebase/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebase/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebase/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebase/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/rebase/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/rebase/expected/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee b/test/integration/rebase/expected/repo/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee rename to test/integration/rebase/expected/repo/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee diff --git a/test/integration/rebase/expected/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef b/test/integration/rebase/expected/repo/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef rename to test/integration/rebase/expected/repo/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef diff --git a/test/integration/rebase/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebase/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/rebase3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebase/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebase/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebase3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebase/expected/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 b/test/integration/rebase/expected/repo/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 rename to test/integration/rebase/expected/repo/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 diff --git a/test/integration/rebase/expected/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c b/test/integration/rebase/expected/repo/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c rename to test/integration/rebase/expected/repo/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c diff --git a/test/integration/rebase/expected/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc b/test/integration/rebase/expected/repo/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc similarity index 100% rename from test/integration/rebase/expected/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc rename to test/integration/rebase/expected/repo/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc diff --git a/test/integration/rebase/expected/.git_keep/refs/heads/master b/test/integration/rebase/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebase/expected/.git_keep/refs/heads/master rename to test/integration/rebase/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebase/expected/file0 b/test/integration/rebase/expected/repo/file0 similarity index 100% rename from test/integration/rebase/expected/file0 rename to test/integration/rebase/expected/repo/file0 diff --git a/test/integration/rebase/expected/file1 b/test/integration/rebase/expected/repo/file1 similarity index 100% rename from test/integration/rebase/expected/file1 rename to test/integration/rebase/expected/repo/file1 diff --git a/test/integration/rebase/expected/file2 b/test/integration/rebase/expected/repo/file2 similarity index 100% rename from test/integration/rebase/expected/file2 rename to test/integration/rebase/expected/repo/file2 diff --git a/test/integration/rebase/expected/file4 b/test/integration/rebase/expected/repo/file4 similarity index 100% rename from test/integration/rebase/expected/file4 rename to test/integration/rebase/expected/repo/file4 diff --git a/test/integration/rebase2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebase2/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebase2/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebase2/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebase2/expected/.git_keep/FETCH_HEAD b/test/integration/rebase2/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebase2/expected/.git_keep/FETCH_HEAD rename to test/integration/rebase2/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/HEAD b/test/integration/rebase2/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/HEAD rename to test/integration/rebase2/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebase2/expected/.git_keep/MERGE_MSG b/test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG similarity index 100% rename from test/integration/rebase2/expected/.git_keep/MERGE_MSG rename to test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG diff --git a/test/integration/rebase2/expected/.git_keep/ORIG_HEAD b/test/integration/rebase2/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/rebase2/expected/.git_keep/ORIG_HEAD rename to test/integration/rebase2/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/rebase2/expected/.git_keep/REBASE_HEAD b/test/integration/rebase2/expected/repo/.git_keep/REBASE_HEAD similarity index 100% rename from test/integration/rebase2/expected/.git_keep/REBASE_HEAD rename to test/integration/rebase2/expected/repo/.git_keep/REBASE_HEAD diff --git a/test/integration/rebase2/expected/.git_keep/config b/test/integration/rebase2/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebase2/expected/.git_keep/config rename to test/integration/rebase2/expected/repo/.git_keep/config diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/description b/test/integration/rebase2/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/description rename to test/integration/rebase2/expected/repo/.git_keep/description diff --git a/test/integration/rebase2/expected/.git_keep/index b/test/integration/rebase2/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebase2/expected/.git_keep/index rename to test/integration/rebase2/expected/repo/.git_keep/index diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/info/exclude b/test/integration/rebase2/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/info/exclude rename to test/integration/rebase2/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebase2/expected/.git_keep/logs/HEAD b/test/integration/rebase2/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebase2/expected/.git_keep/logs/HEAD rename to test/integration/rebase2/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebase2/expected/.git_keep/logs/refs/heads/master b/test/integration/rebase2/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebase2/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebase2/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebase2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebase2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebase2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebase2/expected/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 b/test/integration/rebase2/expected/repo/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 rename to test/integration/rebase2/expected/repo/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 diff --git a/test/integration/rebase2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebase2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebase2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/rebase2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/rebase2/expected/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf b/test/integration/rebase2/expected/repo/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf rename to test/integration/rebase2/expected/repo/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf diff --git a/test/integration/rebase2/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebase2/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/rebase2/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/rebase2/expected/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 b/test/integration/rebase2/expected/repo/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 rename to test/integration/rebase2/expected/repo/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 diff --git a/test/integration/rebase2/expected/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be b/test/integration/rebase2/expected/repo/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be rename to test/integration/rebase2/expected/repo/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be diff --git a/test/integration/rebase2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebase2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebase2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebase2/expected/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 b/test/integration/rebase2/expected/repo/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 rename to test/integration/rebase2/expected/repo/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 diff --git a/test/integration/rebase2/expected/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c b/test/integration/rebase2/expected/repo/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c rename to test/integration/rebase2/expected/repo/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c diff --git a/test/integration/rebase2/expected/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 b/test/integration/rebase2/expected/repo/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 rename to test/integration/rebase2/expected/repo/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 diff --git a/test/integration/rebase2/expected/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 b/test/integration/rebase2/expected/repo/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 rename to test/integration/rebase2/expected/repo/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 diff --git a/test/integration/rebase2/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebase2/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 rename to test/integration/rebase2/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 diff --git a/test/integration/rebase2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebase2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebase2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/rebase2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebase2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebase2/expected/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 b/test/integration/rebase2/expected/repo/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 rename to test/integration/rebase2/expected/repo/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 diff --git a/test/integration/rebase2/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebase2/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 similarity index 100% rename from test/integration/rebase2/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 rename to test/integration/rebase2/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 diff --git a/test/integration/rebase2/expected/.git_keep/refs/heads/master b/test/integration/rebase2/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebase2/expected/.git_keep/refs/heads/master rename to test/integration/rebase2/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebase2/expected/file0 b/test/integration/rebase2/expected/repo/file0 similarity index 100% rename from test/integration/rebase2/expected/file0 rename to test/integration/rebase2/expected/repo/file0 diff --git a/test/integration/rebase2/expected/file1 b/test/integration/rebase2/expected/repo/file1 similarity index 100% rename from test/integration/rebase2/expected/file1 rename to test/integration/rebase2/expected/repo/file1 diff --git a/test/integration/rebase2/expected/file2 b/test/integration/rebase2/expected/repo/file2 similarity index 100% rename from test/integration/rebase2/expected/file2 rename to test/integration/rebase2/expected/repo/file2 diff --git a/test/integration/rebase2/expected/file4 b/test/integration/rebase2/expected/repo/file4 similarity index 100% rename from test/integration/rebase2/expected/file4 rename to test/integration/rebase2/expected/repo/file4 diff --git a/test/integration/rebase3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebase3/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebase3/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebase3/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebase3/expected/.git_keep/FETCH_HEAD b/test/integration/rebase3/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebase3/expected/.git_keep/FETCH_HEAD rename to test/integration/rebase3/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/rebaseFixups/expected/.git_keep/HEAD b/test/integration/rebase3/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/HEAD rename to test/integration/rebase3/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebase3/expected/.git_keep/ORIG_HEAD b/test/integration/rebase3/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/rebase3/expected/.git_keep/ORIG_HEAD rename to test/integration/rebase3/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/rebase3/expected/.git_keep/config b/test/integration/rebase3/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebase3/expected/.git_keep/config rename to test/integration/rebase3/expected/repo/.git_keep/config diff --git a/test/integration/rebaseFixups/expected/.git_keep/description b/test/integration/rebase3/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/description rename to test/integration/rebase3/expected/repo/.git_keep/description diff --git a/test/integration/rebase3/expected/.git_keep/index b/test/integration/rebase3/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebase3/expected/.git_keep/index rename to test/integration/rebase3/expected/repo/.git_keep/index diff --git a/test/integration/rebaseFixups/expected/.git_keep/info/exclude b/test/integration/rebase3/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/info/exclude rename to test/integration/rebase3/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebase3/expected/.git_keep/logs/HEAD b/test/integration/rebase3/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebase3/expected/.git_keep/logs/HEAD rename to test/integration/rebase3/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebase3/expected/.git_keep/logs/refs/heads/master b/test/integration/rebase3/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebase3/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebase3/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebase3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebase3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebase3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebase3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebase3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebase3/expected/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e b/test/integration/rebase3/expected/repo/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e rename to test/integration/rebase3/expected/repo/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e diff --git a/test/integration/rebase3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/rebase3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/rebase3/expected/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc b/test/integration/rebase3/expected/repo/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc rename to test/integration/rebase3/expected/repo/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc diff --git a/test/integration/rebase3/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebase3/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/rebase3/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/rebase3/expected/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c b/test/integration/rebase3/expected/repo/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c rename to test/integration/rebase3/expected/repo/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c diff --git a/test/integration/rebase3/expected/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 b/test/integration/rebase3/expected/repo/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 rename to test/integration/rebase3/expected/repo/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 diff --git a/test/integration/rebase3/expected/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 b/test/integration/rebase3/expected/repo/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 rename to test/integration/rebase3/expected/repo/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 diff --git a/test/integration/rebase3/expected/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 b/test/integration/rebase3/expected/repo/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 rename to test/integration/rebase3/expected/repo/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 diff --git a/test/integration/rebase3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebase3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebase3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebase3/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebase3/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 rename to test/integration/rebase3/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 diff --git a/test/integration/rebase3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebase3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebase3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/rebase3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/rebase3/expected/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 b/test/integration/rebase3/expected/repo/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 rename to test/integration/rebase3/expected/repo/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebase3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebase3/expected/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac b/test/integration/rebase3/expected/repo/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac rename to test/integration/rebase3/expected/repo/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac diff --git a/test/integration/rebase3/expected/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 b/test/integration/rebase3/expected/repo/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 rename to test/integration/rebase3/expected/repo/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 diff --git a/test/integration/rebase3/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebase3/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 similarity index 100% rename from test/integration/rebase3/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 rename to test/integration/rebase3/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 diff --git a/test/integration/rebase3/expected/.git_keep/refs/heads/master b/test/integration/rebase3/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebase3/expected/.git_keep/refs/heads/master rename to test/integration/rebase3/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebase3/expected/file0 b/test/integration/rebase3/expected/repo/file0 similarity index 100% rename from test/integration/rebase3/expected/file0 rename to test/integration/rebase3/expected/repo/file0 diff --git a/test/integration/rebase3/expected/file1 b/test/integration/rebase3/expected/repo/file1 similarity index 100% rename from test/integration/rebase3/expected/file1 rename to test/integration/rebase3/expected/repo/file1 diff --git a/test/integration/rebase3/expected/file2 b/test/integration/rebase3/expected/repo/file2 similarity index 100% rename from test/integration/rebase3/expected/file2 rename to test/integration/rebase3/expected/repo/file2 diff --git a/test/integration/rebase3/expected/file4 b/test/integration/rebase3/expected/repo/file4 similarity index 100% rename from test/integration/rebase3/expected/file4 rename to test/integration/rebase3/expected/repo/file4 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/FETCH_HEAD rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/HEAD rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/ORIG_HEAD rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/config b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/config rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/config diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/description b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/description rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/description diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/index b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/index rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/index diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/info/exclude b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/info/exclude rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/HEAD rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4d/c7f318f68fe1890dba6fb595009c4652c0a861 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4d/c7f318f68fe1890dba6fb595009c4652c0a861 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4d/c7f318f68fe1890dba6fb595009c4652c0a861 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4d/c7f318f68fe1890dba6fb595009c4652c0a861 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/74/d431c56eac1e359f6f5736978347af68af5702 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/76/79fc004a4a40da12907d72ccef14991976aaff b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/76/79fc004a4a40da12907d72ccef14991976aaff similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/76/79fc004a4a40da12907d72ccef14991976aaff rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/76/79fc004a4a40da12907d72ccef14991976aaff diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/7b/01314ccdeccc57cee454feca6369237410e786 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/7b/01314ccdeccc57cee454feca6369237410e786 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/7b/01314ccdeccc57cee454feca6369237410e786 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/7b/01314ccdeccc57cee454feca6369237410e786 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/8a/db7457de59c3945566ce7675a31bbf048b38ee b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/8a/db7457de59c3945566ce7675a31bbf048b38ee similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/8a/db7457de59c3945566ce7675a31bbf048b38ee rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/8a/db7457de59c3945566ce7675a31bbf048b38ee diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/db/ab7e62cd7517f73425d46120a931a59c8eda6e b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/db/ab7e62cd7517f73425d46120a931a59c8eda6e similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/db/ab7e62cd7517f73425d46120a931a59c8eda6e rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/db/ab7e62cd7517f73425d46120a931a59c8eda6e diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 diff --git a/test/integration/rebaseFixupAndSquash/expected/.git_keep/refs/heads/master b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/.git_keep/refs/heads/master rename to test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebaseFixupAndSquash/expected/file0 b/test/integration/rebaseFixupAndSquash/expected/repo/file0 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/file0 rename to test/integration/rebaseFixupAndSquash/expected/repo/file0 diff --git a/test/integration/rebaseFixupAndSquash/expected/file1 b/test/integration/rebaseFixupAndSquash/expected/repo/file1 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/file1 rename to test/integration/rebaseFixupAndSquash/expected/repo/file1 diff --git a/test/integration/rebaseFixupAndSquash/expected/file2 b/test/integration/rebaseFixupAndSquash/expected/repo/file2 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/file2 rename to test/integration/rebaseFixupAndSquash/expected/repo/file2 diff --git a/test/integration/rebaseFixupAndSquash/expected/file4 b/test/integration/rebaseFixupAndSquash/expected/repo/file4 similarity index 100% rename from test/integration/rebaseFixupAndSquash/expected/file4 rename to test/integration/rebaseFixupAndSquash/expected/repo/file4 diff --git a/test/integration/rebaseFixups/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseFixups/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebaseFixups/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebaseFixups/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/FETCH_HEAD rename to test/integration/rebaseFixups/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/HEAD rename to test/integration/rebaseFixups/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebaseFixups/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/ORIG_HEAD rename to test/integration/rebaseFixups/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/rebaseFixups/expected/.git_keep/config b/test/integration/rebaseFixups/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/config rename to test/integration/rebaseFixups/expected/repo/.git_keep/config diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/description b/test/integration/rebaseFixups/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/description rename to test/integration/rebaseFixups/expected/repo/.git_keep/description diff --git a/test/integration/rebaseFixups/expected/.git_keep/index b/test/integration/rebaseFixups/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/index rename to test/integration/rebaseFixups/expected/repo/.git_keep/index diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/info/exclude b/test/integration/rebaseFixups/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/info/exclude rename to test/integration/rebaseFixups/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebaseFixups/expected/.git_keep/logs/HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/logs/HEAD rename to test/integration/rebaseFixups/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebaseFixups/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseFixups/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebaseFixups/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc diff --git a/test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f diff --git a/test/integration/rebaseFixups/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 rename to test/integration/rebaseFixups/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 diff --git a/test/integration/rebaseFixups/expected/.git_keep/refs/heads/master b/test/integration/rebaseFixups/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebaseFixups/expected/.git_keep/refs/heads/master rename to test/integration/rebaseFixups/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebaseFixups/expected/file0 b/test/integration/rebaseFixups/expected/repo/file0 similarity index 100% rename from test/integration/rebaseFixups/expected/file0 rename to test/integration/rebaseFixups/expected/repo/file0 diff --git a/test/integration/rebaseFixups/expected/file1 b/test/integration/rebaseFixups/expected/repo/file1 similarity index 100% rename from test/integration/rebaseFixups/expected/file1 rename to test/integration/rebaseFixups/expected/repo/file1 diff --git a/test/integration/rebaseFixups/expected/file2 b/test/integration/rebaseFixups/expected/repo/file2 similarity index 100% rename from test/integration/rebaseFixups/expected/file2 rename to test/integration/rebaseFixups/expected/repo/file2 diff --git a/test/integration/rebaseFixups/expected/file4 b/test/integration/rebaseFixups/expected/repo/file4 similarity index 100% rename from test/integration/rebaseFixups/expected/file4 rename to test/integration/rebaseFixups/expected/repo/file4 diff --git a/test/integration/rebaseFixups/expected/file5 b/test/integration/rebaseFixups/expected/repo/file5 similarity index 100% rename from test/integration/rebaseFixups/expected/file5 rename to test/integration/rebaseFixups/expected/repo/file5 diff --git a/test/integration/rebaseFixups/expected/file6 b/test/integration/rebaseFixups/expected/repo/file6 similarity index 100% rename from test/integration/rebaseFixups/expected/file6 rename to test/integration/rebaseFixups/expected/repo/file6 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/FETCH_HEAD rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/rebaseSwapping/expected/.git_keep/HEAD b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/HEAD rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/config b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/config rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/config diff --git a/test/integration/rebaseSwapping/expected/.git_keep/description b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/description rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/description diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/index b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/index rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/index diff --git a/test/integration/rebaseSwapping/expected/.git_keep/info/exclude b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/info/exclude rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/HEAD b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/HEAD rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/refs/heads/master b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/.git_keep/refs/heads/master rename to test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebaseRewordLastCommit/expected/file0 b/test/integration/rebaseRewordLastCommit/expected/repo/file0 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/file0 rename to test/integration/rebaseRewordLastCommit/expected/repo/file0 diff --git a/test/integration/rebaseRewordLastCommit/expected/file1 b/test/integration/rebaseRewordLastCommit/expected/repo/file1 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/file1 rename to test/integration/rebaseRewordLastCommit/expected/repo/file1 diff --git a/test/integration/rebaseRewordLastCommit/expected/file2 b/test/integration/rebaseRewordLastCommit/expected/repo/file2 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/file2 rename to test/integration/rebaseRewordLastCommit/expected/repo/file2 diff --git a/test/integration/rebaseRewordLastCommit/expected/file3 b/test/integration/rebaseRewordLastCommit/expected/repo/file3 similarity index 100% rename from test/integration/rebaseRewordLastCommit/expected/file3 rename to test/integration/rebaseRewordLastCommit/expected/repo/file3 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/FETCH_HEAD rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/reflogCherryPick/expected/.git_keep/HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/HEAD rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/ORIG_HEAD rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/config b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/config rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/config diff --git a/test/integration/reflogCheckout/expected/.git_keep/description b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/description similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/description rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/description diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/index b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/index rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/index diff --git a/test/integration/reflogCheckout/expected/.git_keep/info/exclude b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/info/exclude rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/HEAD rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 diff --git a/test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/refs/heads/master b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/.git_keep/refs/heads/master rename to test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebaseRewordOldCommit/expected/file0 b/test/integration/rebaseRewordOldCommit/expected/repo/file0 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/file0 rename to test/integration/rebaseRewordOldCommit/expected/repo/file0 diff --git a/test/integration/rebaseRewordOldCommit/expected/file1 b/test/integration/rebaseRewordOldCommit/expected/repo/file1 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/file1 rename to test/integration/rebaseRewordOldCommit/expected/repo/file1 diff --git a/test/integration/rebaseRewordOldCommit/expected/file2 b/test/integration/rebaseRewordOldCommit/expected/repo/file2 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/file2 rename to test/integration/rebaseRewordOldCommit/expected/repo/file2 diff --git a/test/integration/rebaseRewordOldCommit/expected/file3 b/test/integration/rebaseRewordOldCommit/expected/repo/file3 similarity index 100% rename from test/integration/rebaseRewordOldCommit/expected/file3 rename to test/integration/rebaseRewordOldCommit/expected/repo/file3 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseSwapping/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebaseSwapping/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebaseSwapping/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/FETCH_HEAD rename to test/integration/rebaseSwapping/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/HEAD rename to test/integration/rebaseSwapping/expected/repo/.git_keep/HEAD diff --git a/test/integration/rebaseSwapping/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/ORIG_HEAD rename to test/integration/rebaseSwapping/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/rebaseSwapping/expected/.git_keep/REBASE_HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/REBASE_HEAD similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/REBASE_HEAD rename to test/integration/rebaseSwapping/expected/repo/.git_keep/REBASE_HEAD diff --git a/test/integration/rebaseSwapping/expected/.git_keep/config b/test/integration/rebaseSwapping/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/config rename to test/integration/rebaseSwapping/expected/repo/.git_keep/config diff --git a/test/integration/reflogCherryPick/expected/.git_keep/description b/test/integration/rebaseSwapping/expected/repo/.git_keep/description similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/description rename to test/integration/rebaseSwapping/expected/repo/.git_keep/description diff --git a/test/integration/rebaseSwapping/expected/.git_keep/index b/test/integration/rebaseSwapping/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/index rename to test/integration/rebaseSwapping/expected/repo/.git_keep/index diff --git a/test/integration/reflogCherryPick/expected/.git_keep/info/exclude b/test/integration/rebaseSwapping/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/info/exclude rename to test/integration/rebaseSwapping/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rebaseSwapping/expected/.git_keep/logs/HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/logs/HEAD rename to test/integration/rebaseSwapping/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rebaseSwapping/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseSwapping/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebaseSwapping/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 diff --git a/test/integration/rebaseSwapping/expected/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f rename to test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f diff --git a/test/integration/rebaseSwapping/expected/.git_keep/refs/heads/master b/test/integration/rebaseSwapping/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebaseSwapping/expected/.git_keep/refs/heads/master rename to test/integration/rebaseSwapping/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rebaseSwapping/expected/file0 b/test/integration/rebaseSwapping/expected/repo/file0 similarity index 100% rename from test/integration/rebaseSwapping/expected/file0 rename to test/integration/rebaseSwapping/expected/repo/file0 diff --git a/test/integration/rebaseSwapping/expected/file1 b/test/integration/rebaseSwapping/expected/repo/file1 similarity index 100% rename from test/integration/rebaseSwapping/expected/file1 rename to test/integration/rebaseSwapping/expected/repo/file1 diff --git a/test/integration/rebaseSwapping/expected/file2 b/test/integration/rebaseSwapping/expected/repo/file2 similarity index 100% rename from test/integration/rebaseSwapping/expected/file2 rename to test/integration/rebaseSwapping/expected/repo/file2 diff --git a/test/integration/rebaseSwapping/expected/file4 b/test/integration/rebaseSwapping/expected/repo/file4 similarity index 100% rename from test/integration/rebaseSwapping/expected/file4 rename to test/integration/rebaseSwapping/expected/repo/file4 diff --git a/test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/reflogCheckout/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/FETCH_HEAD rename to test/integration/reflogCheckout/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/reflogCheckout/expected/.git_keep/HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/HEAD rename to test/integration/reflogCheckout/expected/repo/.git_keep/HEAD diff --git a/test/integration/reflogCheckout/expected/.git_keep/config b/test/integration/reflogCheckout/expected/repo/.git_keep/config similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/config rename to test/integration/reflogCheckout/expected/repo/.git_keep/config diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/description b/test/integration/reflogCheckout/expected/repo/.git_keep/description similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/description rename to test/integration/reflogCheckout/expected/repo/.git_keep/description diff --git a/test/integration/reflogCheckout/expected/.git_keep/index b/test/integration/reflogCheckout/expected/repo/.git_keep/index similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/index rename to test/integration/reflogCheckout/expected/repo/.git_keep/index diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/info/exclude b/test/integration/reflogCheckout/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/info/exclude rename to test/integration/reflogCheckout/expected/repo/.git_keep/info/exclude diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/logs/HEAD rename to test/integration/reflogCheckout/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma rename to test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master rename to test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 rename to test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 diff --git a/test/integration/reflogCheckout/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/refs/heads/branch2 rename to test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/reflogCheckout/expected/.git_keep/refs/heads/ma b/test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/ma similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/refs/heads/ma rename to test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/ma diff --git a/test/integration/reflogCheckout/expected/.git_keep/refs/heads/master b/test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/reflogCheckout/expected/.git_keep/refs/heads/master rename to test/integration/reflogCheckout/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/reflogCheckout/expected/file0 b/test/integration/reflogCheckout/expected/repo/file0 similarity index 100% rename from test/integration/reflogCheckout/expected/file0 rename to test/integration/reflogCheckout/expected/repo/file0 diff --git a/test/integration/reflogCheckout/expected/file1 b/test/integration/reflogCheckout/expected/repo/file1 similarity index 100% rename from test/integration/reflogCheckout/expected/file1 rename to test/integration/reflogCheckout/expected/repo/file1 diff --git a/test/integration/reflogCheckout/expected/file2 b/test/integration/reflogCheckout/expected/repo/file2 similarity index 100% rename from test/integration/reflogCheckout/expected/file2 rename to test/integration/reflogCheckout/expected/repo/file2 diff --git a/test/integration/reflogCheckout/expected/file4 b/test/integration/reflogCheckout/expected/repo/file4 similarity index 100% rename from test/integration/reflogCheckout/expected/file4 rename to test/integration/reflogCheckout/expected/repo/file4 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/reflogCherryPick/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/FETCH_HEAD rename to test/integration/reflogCherryPick/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/searching/expected/.git_keep/HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/searching/expected/.git_keep/HEAD rename to test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD diff --git a/test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD rename to test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/reflogCherryPick/expected/.git_keep/config b/test/integration/reflogCherryPick/expected/repo/.git_keep/config similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/config rename to test/integration/reflogCherryPick/expected/repo/.git_keep/config diff --git a/test/integration/reflogHardReset/expected/.git_keep/description b/test/integration/reflogCherryPick/expected/repo/.git_keep/description similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/description rename to test/integration/reflogCherryPick/expected/repo/.git_keep/description diff --git a/test/integration/reflogCherryPick/expected/.git_keep/index b/test/integration/reflogCherryPick/expected/repo/.git_keep/index similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/index rename to test/integration/reflogCherryPick/expected/repo/.git_keep/index diff --git a/test/integration/reflogHardReset/expected/.git_keep/info/exclude b/test/integration/reflogCherryPick/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/info/exclude rename to test/integration/reflogCherryPick/expected/repo/.git_keep/info/exclude diff --git a/test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD rename to test/integration/reflogCherryPick/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master rename to test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 rename to test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master b/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master rename to test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/file0 b/test/integration/reflogCherryPick/expected/repo/file0 similarity index 100% rename from test/integration/reflogCherryPick/expected/file0 rename to test/integration/reflogCherryPick/expected/repo/file0 diff --git a/test/integration/reflogCherryPick/expected/file1 b/test/integration/reflogCherryPick/expected/repo/file1 similarity index 100% rename from test/integration/reflogCherryPick/expected/file1 rename to test/integration/reflogCherryPick/expected/repo/file1 diff --git a/test/integration/reflogCherryPick/expected/file2 b/test/integration/reflogCherryPick/expected/repo/file2 similarity index 100% rename from test/integration/reflogCherryPick/expected/file2 rename to test/integration/reflogCherryPick/expected/repo/file2 diff --git a/test/integration/reflogCherryPick/expected/file4 b/test/integration/reflogCherryPick/expected/repo/file4 similarity index 100% rename from test/integration/reflogCherryPick/expected/file4 rename to test/integration/reflogCherryPick/expected/repo/file4 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/FETCH_HEAD rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/HEAD rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/config b/test/integration/reflogCommitFiles/expected/repo/.git_keep/config similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/config rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/config diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/description b/test/integration/reflogCommitFiles/expected/repo/.git_keep/description similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/description rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/description diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/index b/test/integration/reflogCommitFiles/expected/repo/.git_keep/index similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/index rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/index diff --git a/test/integration/searching/expected/.git_keep/info/exclude b/test/integration/reflogCommitFiles/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/searching/expected/.git_keep/info/exclude rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/info/exclude diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/logs/HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/logs/HEAD rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/searching/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master b/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master rename to test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/reflogCommitFiles/expected/file0 b/test/integration/reflogCommitFiles/expected/repo/file0 similarity index 100% rename from test/integration/reflogCommitFiles/expected/file0 rename to test/integration/reflogCommitFiles/expected/repo/file0 diff --git a/test/integration/reflogCommitFiles/expected/file1 b/test/integration/reflogCommitFiles/expected/repo/file1 similarity index 100% rename from test/integration/reflogCommitFiles/expected/file1 rename to test/integration/reflogCommitFiles/expected/repo/file1 diff --git a/test/integration/reflogCommitFiles/expected/file2 b/test/integration/reflogCommitFiles/expected/repo/file2 similarity index 100% rename from test/integration/reflogCommitFiles/expected/file2 rename to test/integration/reflogCommitFiles/expected/repo/file2 diff --git a/test/integration/reflogCommitFiles/expected/file4 b/test/integration/reflogCommitFiles/expected/repo/file4 similarity index 100% rename from test/integration/reflogCommitFiles/expected/file4 rename to test/integration/reflogCommitFiles/expected/repo/file4 diff --git a/test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/reflogHardReset/expected/.git_keep/FETCH_HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/FETCH_HEAD rename to test/integration/reflogHardReset/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/reflogHardReset/expected/.git_keep/HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/HEAD rename to test/integration/reflogHardReset/expected/repo/.git_keep/HEAD diff --git a/test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD rename to test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/reflogHardReset/expected/.git_keep/config b/test/integration/reflogHardReset/expected/repo/.git_keep/config similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/config rename to test/integration/reflogHardReset/expected/repo/.git_keep/config diff --git a/test/integration/searching/expected/.git_keep/description b/test/integration/reflogHardReset/expected/repo/.git_keep/description similarity index 100% rename from test/integration/searching/expected/.git_keep/description rename to test/integration/reflogHardReset/expected/repo/.git_keep/description diff --git a/test/integration/reflogHardReset/expected/.git_keep/index b/test/integration/reflogHardReset/expected/repo/.git_keep/index similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/index rename to test/integration/reflogHardReset/expected/repo/.git_keep/index diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/info/exclude b/test/integration/reflogHardReset/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/info/exclude rename to test/integration/reflogHardReset/expected/repo/.git_keep/info/exclude diff --git a/test/integration/reflogHardReset/expected/.git_keep/logs/HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/logs/HEAD rename to test/integration/reflogHardReset/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master rename to test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/setUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 rename to test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/refs/heads/master b/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/reflogHardReset/expected/.git_keep/refs/heads/master rename to test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/reflogHardReset/expected/file0 b/test/integration/reflogHardReset/expected/repo/file0 similarity index 100% rename from test/integration/reflogHardReset/expected/file0 rename to test/integration/reflogHardReset/expected/repo/file0 diff --git a/test/integration/reflogHardReset/expected/file1 b/test/integration/reflogHardReset/expected/repo/file1 similarity index 100% rename from test/integration/reflogHardReset/expected/file1 rename to test/integration/reflogHardReset/expected/repo/file1 diff --git a/test/integration/reflogHardReset/expected/file2 b/test/integration/reflogHardReset/expected/repo/file2 similarity index 100% rename from test/integration/reflogHardReset/expected/file2 rename to test/integration/reflogHardReset/expected/repo/file2 diff --git a/test/integration/reflogHardReset/expected/file4 b/test/integration/reflogHardReset/expected/repo/file4 similarity index 100% rename from test/integration/reflogHardReset/expected/file4 rename to test/integration/reflogHardReset/expected/repo/file4 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/FETCH_HEAD b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/FETCH_HEAD rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/HEAD b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/HEAD rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/HEAD diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/config b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/config similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/config rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/config diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/description b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/description similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/description rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/description diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/index similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/index diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/info/exclude b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/info/exclude rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/info/exclude diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/6c/493ff740f9380390d5c9ddef4af18697ac9375 b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/6c/493ff740f9380390d5c9ddef4af18697ac9375 similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/6c/493ff740f9380390d5c9ddef4af18697ac9375 rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/6c/493ff740f9380390d5c9ddef4af18697ac9375 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/ae/ac8b060acee50f309eb1f6698a981c50bdf493 b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/ae/ac8b060acee50f309eb1f6698a981c50bdf493 similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/ae/ac8b060acee50f309eb1f6698a981c50bdf493 rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/ae/ac8b060acee50f309eb1f6698a981c50bdf493 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c2/bf9b666a310383fd7095bc5bd993bba11b040e b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/c2/bf9b666a310383fd7095bc5bd993bba11b040e similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c2/bf9b666a310383fd7095bc5bd993bba11b040e rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/c2/bf9b666a310383fd7095bc5bd993bba11b040e diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c9/62a96f68e65b4dc8e0fea12db5f9006091efdf b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/c9/62a96f68e65b4dc8e0fea12db5f9006091efdf similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c9/62a96f68e65b4dc8e0fea12db5f9006091efdf rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/c9/62a96f68e65b4dc8e0fea12db5f9006091efdf diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/d0/ce4cb10cd926f646a08889b077a6d7eddd3534 b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/d0/ce4cb10cd926f646a08889b077a6d7eddd3534 similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/d0/ce4cb10cd926f646a08889b077a6d7eddd3534 rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/d0/ce4cb10cd926f646a08889b077a6d7eddd3534 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/e2/129701f1a4d54dc44f03c93bca0a2aec7c5449 b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/e2/129701f1a4d54dc44f03c93bca0a2aec7c5449 similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/e2/129701f1a4d54dc44f03c93bca0a2aec7c5449 rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/objects/e2/129701f1a4d54dc44f03c93bca0a2aec7c5449 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master b/test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master rename to test/integration/rememberCommitMessageAfterFail/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/rememberCommitMessageAfterFail/expected/file1 b/test/integration/rememberCommitMessageAfterFail/expected/repo/file1 similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/file1 rename to test/integration/rememberCommitMessageAfterFail/expected/repo/file1 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/file2 b/test/integration/rememberCommitMessageAfterFail/expected/repo/file2 similarity index 100% rename from test/integration/rememberCommitMessageAfterFail/expected/file2 rename to test/integration/rememberCommitMessageAfterFail/expected/repo/file2 diff --git a/test/integration/searching/expected/.git_keep/COMMIT_EDITMSG b/test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/searching/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/searching/expected/.git_keep/FETCH_HEAD b/test/integration/searching/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/searching/expected/.git_keep/FETCH_HEAD rename to test/integration/searching/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/setUpstream/expected/.git_keep/HEAD b/test/integration/searching/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/HEAD rename to test/integration/searching/expected/repo/.git_keep/HEAD diff --git a/test/integration/searching/expected/.git_keep/config b/test/integration/searching/expected/repo/.git_keep/config similarity index 100% rename from test/integration/searching/expected/.git_keep/config rename to test/integration/searching/expected/repo/.git_keep/config diff --git a/test/integration/setUpstream/expected/.git_keep/description b/test/integration/searching/expected/repo/.git_keep/description similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/description rename to test/integration/searching/expected/repo/.git_keep/description diff --git a/test/integration/searching/expected/.git_keep/index b/test/integration/searching/expected/repo/.git_keep/index similarity index 100% rename from test/integration/searching/expected/.git_keep/index rename to test/integration/searching/expected/repo/.git_keep/index diff --git a/test/integration/setUpstream/expected/.git_keep/info/exclude b/test/integration/searching/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/info/exclude rename to test/integration/searching/expected/repo/.git_keep/info/exclude diff --git a/test/integration/searching/expected/.git_keep/logs/HEAD b/test/integration/searching/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/searching/expected/.git_keep/logs/HEAD rename to test/integration/searching/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/searching/expected/.git_keep/logs/refs/heads/master b/test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/searching/expected/.git_keep/logs/refs/heads/master rename to test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/setUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/searching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/searching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/setUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/searching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/searching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/setUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/searching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/searching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/searching/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/searching/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/searching/expected/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c b/test/integration/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c rename to test/integration/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c diff --git a/test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 b/test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 rename to test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 diff --git a/test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d b/test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d rename to test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d diff --git a/test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 b/test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 rename to test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 diff --git a/test/integration/setUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/searching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/searching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/setUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/searching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/searching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/setUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/searching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/searching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/setUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/searching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/searching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 b/test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 rename to test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 diff --git a/test/integration/searching/expected/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 b/test/integration/searching/expected/repo/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 similarity index 100% rename from test/integration/searching/expected/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 rename to test/integration/searching/expected/repo/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 diff --git a/test/integration/searching/expected/.git_keep/refs/heads/master b/test/integration/searching/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/searching/expected/.git_keep/refs/heads/master rename to test/integration/searching/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/setUpstream/expected/myfile1 b/test/integration/searching/expected/repo/myfile1 similarity index 100% rename from test/integration/setUpstream/expected/myfile1 rename to test/integration/searching/expected/repo/myfile1 diff --git a/test/integration/searching/expected/myfile3 b/test/integration/searching/expected/repo/myfile3 similarity index 100% rename from test/integration/searching/expected/myfile3 rename to test/integration/searching/expected/repo/myfile3 diff --git a/test/integration/searching/expected/myfile4 b/test/integration/searching/expected/repo/myfile4 similarity index 100% rename from test/integration/searching/expected/myfile4 rename to test/integration/searching/expected/repo/myfile4 diff --git a/test/integration/searching/expected/myfile5 b/test/integration/searching/expected/repo/myfile5 similarity index 100% rename from test/integration/searching/expected/myfile5 rename to test/integration/searching/expected/repo/myfile5 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/COMMIT_EDITMSG b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/FETCH_HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/FETCH_HEAD rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/setUpstream/expected_remote/HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/setUpstream/expected_remote/HEAD rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/config b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/config similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/config rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/config diff --git a/test/integration/setUpstream/expected_remote/description b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/description similarity index 100% rename from test/integration/setUpstream/expected_remote/description rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/description diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/index b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/index similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/index rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/index diff --git a/test/integration/setUpstream/expected_remote/info/exclude b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/setUpstream/expected_remote/info/exclude rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/info/exclude diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/logs/HEAD rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master rename to test/integration/searchingInStagingPanel/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/searchingInStagingPanel/expected/myfile1 b/test/integration/searchingInStagingPanel/expected/repo/myfile1 similarity index 100% rename from test/integration/searchingInStagingPanel/expected/myfile1 rename to test/integration/searchingInStagingPanel/expected/repo/myfile1 diff --git a/test/integration/setUpstream/expected/.git_keep/FETCH_HEAD b/test/integration/setUpstream/expected/.git_keep/FETCH_HEAD deleted file mode 100644 index 865fc1191..000000000 --- a/test/integration/setUpstream/expected/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -148a38f7ce513079d6cd40e4a02f11e46ea2ba6b branch 'master' of ../actual_remote diff --git a/test/integration/setUpstream/expected/.git_keep/ORIG_HEAD b/test/integration/setUpstream/expected/.git_keep/ORIG_HEAD deleted file mode 100644 index 131e55236..000000000 --- a/test/integration/setUpstream/expected/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -058c8904c25889dd77ee3e817325fd1a28134037 diff --git a/test/integration/setUpstream/expected/.git_keep/config b/test/integration/setUpstream/expected/.git_keep/config deleted file mode 100644 index 821803a3e..000000000 --- a/test/integration/setUpstream/expected/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../actual_remote - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/setUpstream/expected/.git_keep/index b/test/integration/setUpstream/expected/.git_keep/index deleted file mode 100644 index 9c34edeae..000000000 Binary files a/test/integration/setUpstream/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/setUpstream/expected/.git_keep/logs/HEAD b/test/integration/setUpstream/expected/.git_keep/logs/HEAD deleted file mode 100644 index 0a0706f6a..000000000 --- a/test/integration/setUpstream/expected/.git_keep/logs/HEAD +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 7d7da1f440cca8d28eaf4b46e63f207993562b84 CI 1634898072 +1100 commit (initial): myfile1 -7d7da1f440cca8d28eaf4b46e63f207993562b84 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 commit: myfile2 -058c8904c25889dd77ee3e817325fd1a28134037 409dd039b9ec270067678ae23b710c8e4c49c458 CI 1634898072 +1100 commit: myfile3 -409dd039b9ec270067678ae23b710c8e4c49c458 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898072 +1100 commit: myfile4 -148a38f7ce513079d6cd40e4a02f11e46ea2ba6b 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 reset: moving to HEAD~2 -058c8904c25889dd77ee3e817325fd1a28134037 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898082 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/setUpstream/expected/.git_keep/logs/refs/heads/master b/test/integration/setUpstream/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 0a0706f6a..000000000 --- a/test/integration/setUpstream/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 7d7da1f440cca8d28eaf4b46e63f207993562b84 CI 1634898072 +1100 commit (initial): myfile1 -7d7da1f440cca8d28eaf4b46e63f207993562b84 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 commit: myfile2 -058c8904c25889dd77ee3e817325fd1a28134037 409dd039b9ec270067678ae23b710c8e4c49c458 CI 1634898072 +1100 commit: myfile3 -409dd039b9ec270067678ae23b710c8e4c49c458 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898072 +1100 commit: myfile4 -148a38f7ce513079d6cd40e4a02f11e46ea2ba6b 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 reset: moving to HEAD~2 -058c8904c25889dd77ee3e817325fd1a28134037 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898082 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/setUpstream/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/setUpstream/expected/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 10925c1eb..000000000 --- a/test/integration/setUpstream/expected/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898079 +1100 fetch origin: storing head diff --git a/test/integration/setUpstream/expected/.git_keep/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 b/test/integration/setUpstream/expected/.git_keep/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 deleted file mode 100644 index ae34bb7c1..000000000 --- a/test/integration/setUpstream/expected/.git_keep/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚$“é$"BW=Ƥ™`ÁØR"èííÜ~ÞâÏkkK·žñÔwU+1 —«+Eµ2±×L€ì* '³É®¯nc‰E|Etó,©@R©˜‘”B™Ã@y÷ǺÛq²×qºëGÚöÔ˼¶›õ0qrìÙ{çÌQ©®rÓ¾uy*˜Ýœ:< \ No newline at end of file diff --git a/test/integration/setUpstream/expected/.git_keep/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b b/test/integration/setUpstream/expected/.git_keep/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b deleted file mode 100644 index 9d94a934d..000000000 --- a/test/integration/setUpstream/expected/.git_keep/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -ƒ0@Ñ®sŠì e&™L& ¥àÊcÄ8RÁT‘ÚÛ×#tûy‹_¶Z—f1Ñ¥ªÖÍŒ‘ € /3ÒˆÌA²¬‘ùPrHhö|è«Y‚4MàÓ˜´¸À‘£du~ŒE” -¥BAL~·çvØ~°]?<ô“ë¾ê­lõn‘=IˆÎ^ÌYÏ©¦rS¿ó²*™–º8M \ No newline at end of file diff --git a/test/integration/setUpstream/expected/.git_keep/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 b/test/integration/setUpstream/expected/.git_keep/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 deleted file mode 100644 index fa4e2ebaa..000000000 --- a/test/integration/setUpstream/expected/.git_keep/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 +++ /dev/null @@ -1,3 +0,0 @@ -xŽA -à E»öî Åq4ŽJ!«ÃŒ# Ä& ííëºúðx<>ïµ®MCt—vŠh»@@¦rqˆ%9,%eÀB†iA°ìû²¨#òjÚxbŠÆ±õD1çDP¨G¬/’%@g0¨ônÏýÔÓ¬Çi~È'Õc“ïõ®a@G‘L°ú -`Œê´Ÿjò§®ê·¬› úÀÚ9ö \ No newline at end of file diff --git a/test/integration/setUpstream/expected/.git_keep/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 b/test/integration/setUpstream/expected/.git_keep/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 deleted file mode 100644 index 54afb1c5a..000000000 --- a/test/integration/setUpstream/expected/.git_keep/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0@Q×9Åìɤãd -"BW=Æ4™`¡!R"èííÜ~üÔj]; ñ©ïfàSñÊKM2‘¡p Š%ÒBCf*š®Áé»?ÛÓ ·i~ØGëk³KjõÈÉ(>8#zïŽzLºýÉ]ý–u3t?4A,Ù \ No newline at end of file diff --git a/test/integration/setUpstream/expected/.git_keep/refs/heads/master b/test/integration/setUpstream/expected/.git_keep/refs/heads/master deleted file mode 100644 index 25aa18f55..000000000 --- a/test/integration/setUpstream/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -148a38f7ce513079d6cd40e4a02f11e46ea2ba6b diff --git a/test/integration/setUpstream/expected/.git_keep/refs/remotes/origin/master b/test/integration/setUpstream/expected/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 25aa18f55..000000000 --- a/test/integration/setUpstream/expected/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -148a38f7ce513079d6cd40e4a02f11e46ea2ba6b diff --git a/test/integration/squash/expected/.git_keep/HEAD b/test/integration/setUpstream/expected/origin/HEAD similarity index 100% rename from test/integration/squash/expected/.git_keep/HEAD rename to test/integration/setUpstream/expected/origin/HEAD diff --git a/test/integration/setUpstream/expected/origin/config b/test/integration/setUpstream/expected/origin/config new file mode 100644 index 000000000..63958f045 --- /dev/null +++ b/test/integration/setUpstream/expected/origin/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/setUpstream/actual/./repo diff --git a/test/integration/squash/expected/.git_keep/description b/test/integration/setUpstream/expected/origin/description similarity index 100% rename from test/integration/squash/expected/.git_keep/description rename to test/integration/setUpstream/expected/origin/description diff --git a/test/integration/squash/expected/.git_keep/info/exclude b/test/integration/setUpstream/expected/origin/info/exclude similarity index 100% rename from test/integration/squash/expected/.git_keep/info/exclude rename to test/integration/setUpstream/expected/origin/info/exclude diff --git a/test/integration/squash/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/setUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/squash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/setUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/setUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce rename to test/integration/setUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/setUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/setUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/setUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/setUpstream/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 b/test/integration/setUpstream/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 new file mode 100644 index 000000000..a6fdc2a4b Binary files /dev/null and b/test/integration/setUpstream/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 differ diff --git a/test/integration/setUpstream/expected/origin/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 b/test/integration/setUpstream/expected/origin/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 new file mode 100644 index 000000000..30dddbf70 --- /dev/null +++ b/test/integration/setUpstream/expected/origin/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 @@ -0,0 +1,2 @@ +xÍA +Â0@Q×9ÅìÉ$Ói¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð2^5"ÅÄ%a¬#- S•<'ïþl;L3ܦù¡±×¦—ÜìÈ”"q"œ½wG=&]ÿäξuÝÝ27,Í \ No newline at end of file diff --git a/test/integration/setUpstream/expected/origin/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 b/test/integration/setUpstream/expected/origin/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 new file mode 100644 index 000000000..e17ab2106 --- /dev/null +++ b/test/integration/setUpstream/expected/origin/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 @@ -0,0 +1,4 @@ +xÎA +Â0@Q×9ÅìÉL’iD„®zŒ¤™`ÁØR"èííÜ~ÞâÏkkKê»*¤ÁyLAª-Eµ +‹²ÔÌŽ#1¢l+yd³¥]_ØÙ@A +ŠYÕsv™#–´„¹"©äD&½ûcÝaœà:Nwý¤¶=õ2¯íÈ>:Ïœ­5G=¦ºþÉMûÖå©d~”Ë9É \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/setUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/squash/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/setUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/setUpstream/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 b/test/integration/setUpstream/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 new file mode 100644 index 000000000..714f1dd9d Binary files /dev/null and b/test/integration/setUpstream/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 differ diff --git a/test/integration/squash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 rename to test/integration/setUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/squash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/setUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/setUpstream/expected/origin/packed-refs b/test/integration/setUpstream/expected/origin/packed-refs new file mode 100644 index 000000000..300d293d2 --- /dev/null +++ b/test/integration/setUpstream/expected/origin/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +30ef3df33d31f0b98298881be4dbe69c54758ba2 refs/heads/master diff --git a/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..125d82b6f --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +30ef3df33d31f0b98298881be4dbe69c54758ba2 branch 'master' of ../origin diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/HEAD b/test/integration/setUpstream/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/HEAD rename to test/integration/setUpstream/expected/repo/.git_keep/HEAD diff --git a/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD b/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..0b53f05ce --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/config b/test/integration/setUpstream/expected/repo/.git_keep/config new file mode 100644 index 000000000..7721ae814 --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/config @@ -0,0 +1,16 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[remote "origin"] + url = ../origin + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/description b/test/integration/setUpstream/expected/repo/.git_keep/description similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/description rename to test/integration/setUpstream/expected/repo/.git_keep/description diff --git a/test/integration/setUpstream/expected/repo/.git_keep/index b/test/integration/setUpstream/expected/repo/.git_keep/index new file mode 100644 index 000000000..99e8224eb Binary files /dev/null and b/test/integration/setUpstream/expected/repo/.git_keep/index differ diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/info/exclude b/test/integration/setUpstream/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/info/exclude rename to test/integration/setUpstream/expected/repo/.git_keep/info/exclude diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/setUpstream/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..aba248ca8 --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 6305259d1908bee46b3b686702ed55b6f12e9ba2 CI 1648346253 +1100 commit (initial): myfile1 +6305259d1908bee46b3b686702ed55b6f12e9ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 commit: myfile2 +a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 c6ffcbed8902934d462722ff6ef471813b9a4df5 CI 1648346253 +1100 commit: myfile3 +c6ffcbed8902934d462722ff6ef471813b9a4df5 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346253 +1100 commit: myfile4 +30ef3df33d31f0b98298881be4dbe69c54758ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 reset: moving to HEAD~2 +a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (start): checkout 30ef3df33d31f0b98298881be4dbe69c54758ba2 +30ef3df33d31f0b98298881be4dbe69c54758ba2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..e0e98143e --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 6305259d1908bee46b3b686702ed55b6f12e9ba2 CI 1648346253 +1100 commit (initial): myfile1 +6305259d1908bee46b3b686702ed55b6f12e9ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 commit: myfile2 +a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 c6ffcbed8902934d462722ff6ef471813b9a4df5 CI 1648346253 +1100 commit: myfile3 +c6ffcbed8902934d462722ff6ef471813b9a4df5 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346253 +1100 commit: myfile4 +30ef3df33d31f0b98298881be4dbe69c54758ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 reset: moving to HEAD~2 +a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (finish): refs/heads/master onto 30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..774c65ed0 --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346260 +1100 fetch origin: storing head diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/setUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/stash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/setUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/setUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 000000000..0a734f981 Binary files /dev/null and b/test/integration/setUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce differ diff --git a/test/integration/setUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/setUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/setUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 b/test/integration/setUpstream/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 new file mode 100644 index 000000000..a6fdc2a4b Binary files /dev/null and b/test/integration/setUpstream/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 b/test/integration/setUpstream/expected/repo/.git_keep/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 new file mode 100644 index 000000000..30dddbf70 --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 @@ -0,0 +1,2 @@ +xÍA +Â0@Q×9ÅìÉ$Ói¡«cšL°Ð!R"èííÜ~üÜÌÖH|ê»*xå\½ð2^5"ÅÄ%a¬#- S•<'ïþl;L3ܦù¡±×¦—ÜìÈ”"q"œ½wG=&]ÿäξuÝÝ27,Í \ No newline at end of file diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 b/test/integration/setUpstream/expected/repo/.git_keep/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 new file mode 100644 index 000000000..e17ab2106 --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 @@ -0,0 +1,4 @@ +xÎA +Â0@Q×9ÅìÉL’iD„®zŒ¤™`ÁØR"èííÜ~ÞâÏkkKê»*¤ÁyLAª-Eµ +‹²ÔÌŽ#1¢l+yd³¥]_ØÙ@A +ŠYÕsv™#–´„¹"©äD&½ûcÝaœà:Nwý¤¶=õ2¯íÈ>:Ïœ­5G=¦ºþÉMûÖå©d~”Ë9É \ No newline at end of file diff --git a/test/integration/stash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/setUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/setUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 b/test/integration/setUpstream/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 new file mode 100644 index 000000000..714f1dd9d Binary files /dev/null and b/test/integration/setUpstream/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 000000000..d39fa7d2f Binary files /dev/null and b/test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 differ diff --git a/test/integration/tags2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/setUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..af1728373 --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..af1728373 --- /dev/null +++ b/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/squash/expected/myfile1 b/test/integration/setUpstream/expected/repo/myfile1 similarity index 100% rename from test/integration/squash/expected/myfile1 rename to test/integration/setUpstream/expected/repo/myfile1 diff --git a/test/integration/squash/expected/myfile2 b/test/integration/setUpstream/expected/repo/myfile2 similarity index 100% rename from test/integration/squash/expected/myfile2 rename to test/integration/setUpstream/expected/repo/myfile2 diff --git a/test/integration/setUpstream/expected/myfile3 b/test/integration/setUpstream/expected/repo/myfile3 similarity index 100% rename from test/integration/setUpstream/expected/myfile3 rename to test/integration/setUpstream/expected/repo/myfile3 diff --git a/test/integration/setUpstream/expected/myfile4 b/test/integration/setUpstream/expected/repo/myfile4 similarity index 100% rename from test/integration/setUpstream/expected/myfile4 rename to test/integration/setUpstream/expected/repo/myfile4 diff --git a/test/integration/setUpstream/expected_remote/config b/test/integration/setUpstream/expected_remote/config deleted file mode 100644 index 1a0f699c7..000000000 --- a/test/integration/setUpstream/expected_remote/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/setUpstream/./actual diff --git a/test/integration/setUpstream/expected_remote/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 b/test/integration/setUpstream/expected_remote/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 deleted file mode 100644 index ae34bb7c1..000000000 --- a/test/integration/setUpstream/expected_remote/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 +++ /dev/null @@ -1,2 +0,0 @@ -xÎA -Â0@Q×9Eö‚$“é$"BW=Ƥ™`ÁØR"èííÜ~ÞâÏkkK·žñÔwU+1 —«+Eµ2±×L€ì* '³É®¯nc‰E|Etó,©@R©˜‘”B™Ã@y÷ǺÛq²×qºëGÚöÔ˼¶›õ0qrìÙ{çÌQ©®rÓ¾uy*˜Ýœ:< \ No newline at end of file diff --git a/test/integration/setUpstream/expected_remote/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b b/test/integration/setUpstream/expected_remote/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b deleted file mode 100644 index 9d94a934d..000000000 --- a/test/integration/setUpstream/expected_remote/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b +++ /dev/null @@ -1,3 +0,0 @@ -xÎA -ƒ0@Ñ®sŠì e&™L& ¥àÊcÄ8RÁT‘ÚÛ×#tûy‹_¶Z—f1Ñ¥ªÖÍŒ‘ € /3ÒˆÌA²¬‘ùPrHhö|è«Y‚4MàÓ˜´¸À‘£du~ŒE” -¥BAL~·çvØ~°]?<ô“ë¾ê­lõn‘=IˆÎ^ÌYÏ©¦rS¿ó²*™–º8M \ No newline at end of file diff --git a/test/integration/setUpstream/expected_remote/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 b/test/integration/setUpstream/expected_remote/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 deleted file mode 100644 index fa4e2ebaa..000000000 --- a/test/integration/setUpstream/expected_remote/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 +++ /dev/null @@ -1,3 +0,0 @@ -xŽA -à E»öî Åq4ŽJ!«ÃŒ# Ä& ííëºúðx<>ïµ®MCt—vŠh»@@¦rqˆ%9,%eÀB†iA°ìû²¨#òjÚxbŠÆ±õD1çDP¨G¬/’%@g0¨ônÏýÔÓ¬Çi~È'Õc“ïõ®a@G‘L°ú -`Œê´Ÿjò§®ê·¬› úÀÚ9ö \ No newline at end of file diff --git a/test/integration/setUpstream/expected_remote/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 b/test/integration/setUpstream/expected_remote/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 deleted file mode 100644 index 54afb1c5a..000000000 --- a/test/integration/setUpstream/expected_remote/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 +++ /dev/null @@ -1,3 +0,0 @@ -xÍA -Â0@Q×9Åìɤãd -"BW=Æ4™`¡!R"èííÜ~üÔj]; ñ©ïfàSñÊKM2‘¡p Š%ÒBCf*š®Áé»?ÛÓ ·i~ØGëk³KjõÈÉ(>8#zïŽzLºýÉ]ý–u3t?4A,Ù \ No newline at end of file diff --git a/test/integration/setUpstream/expected_remote/packed-refs b/test/integration/setUpstream/expected_remote/packed-refs deleted file mode 100644 index a5eca4e4d..000000000 --- a/test/integration/setUpstream/expected_remote/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -148a38f7ce513079d6cd40e4a02f11e46ea2ba6b refs/heads/master diff --git a/test/integration/setUpstream/recording.json b/test/integration/setUpstream/recording.json index d4983d00b..8776559d9 100644 --- a/test/integration/setUpstream/recording.json +++ b/test/integration/setUpstream/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":555,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1226,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1731,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1971,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2131,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2219,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2274,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2338,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2418,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2843,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3379,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3522,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3690,"Mod":0,"Key":256,"Ch":47},{"Timestamp":3947,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4105,"Mod":0,"Key":256,"Ch":99},{"Timestamp":4266,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4338,"Mod":0,"Key":256,"Ch":117},{"Timestamp":4442,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4530,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4731,"Mod":0,"Key":256,"Ch":95},{"Timestamp":4915,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4962,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5041,"Mod":0,"Key":256,"Ch":109},{"Timestamp":5090,"Mod":0,"Key":256,"Ch":111},{"Timestamp":5146,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5170,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5443,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6313,"Mod":0,"Key":256,"Ch":102},{"Timestamp":7171,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7883,"Mod":0,"Key":256,"Ch":117},{"Timestamp":8459,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9411,"Mod":0,"Key":256,"Ch":112},{"Timestamp":10298,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":808,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1221,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1598,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2267,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2399,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2500,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2573,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2634,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2710,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3042,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3671,"Mod":0,"Key":256,"Ch":46},{"Timestamp":4001,"Mod":0,"Key":256,"Ch":46},{"Timestamp":4215,"Mod":0,"Key":256,"Ch":47},{"Timestamp":4511,"Mod":0,"Key":256,"Ch":111},{"Timestamp":4896,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5008,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5133,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5202,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5255,"Mod":0,"Key":256,"Ch":110},{"Timestamp":5558,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6247,"Mod":0,"Key":256,"Ch":102},{"Timestamp":7072,"Mod":0,"Key":256,"Ch":91},{"Timestamp":7716,"Mod":0,"Key":256,"Ch":112},{"Timestamp":8319,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9159,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":254,"Height":74}]} \ No newline at end of file diff --git a/test/integration/setUpstream/setup.sh b/test/integration/setUpstream/setup.sh index a5a68834a..d0bc91327 100644 --- a/test/integration/setUpstream/setup.sh +++ b/test/integration/setUpstream/setup.sh @@ -25,8 +25,8 @@ git add . git commit -am "myfile4" cd .. -git clone --bare ./actual actual_remote +git clone --bare ./repo origin -cd actual +cd repo git reset --hard HEAD~2 diff --git a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/squash/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/squash/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/squash/expected/.git_keep/FETCH_HEAD b/test/integration/squash/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/squash/expected/.git_keep/FETCH_HEAD rename to test/integration/squash/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/staging/expected/.git_keep/HEAD b/test/integration/squash/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/staging/expected/.git_keep/HEAD rename to test/integration/squash/expected/repo/.git_keep/HEAD diff --git a/test/integration/squash/expected/.git_keep/ORIG_HEAD b/test/integration/squash/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/squash/expected/.git_keep/ORIG_HEAD rename to test/integration/squash/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/squash/expected/.git_keep/config b/test/integration/squash/expected/repo/.git_keep/config similarity index 100% rename from test/integration/squash/expected/.git_keep/config rename to test/integration/squash/expected/repo/.git_keep/config diff --git a/test/integration/staging/expected/.git_keep/description b/test/integration/squash/expected/repo/.git_keep/description similarity index 100% rename from test/integration/staging/expected/.git_keep/description rename to test/integration/squash/expected/repo/.git_keep/description diff --git a/test/integration/squash/expected/.git_keep/index b/test/integration/squash/expected/repo/.git_keep/index similarity index 100% rename from test/integration/squash/expected/.git_keep/index rename to test/integration/squash/expected/repo/.git_keep/index diff --git a/test/integration/staging/expected/.git_keep/info/exclude b/test/integration/squash/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/staging/expected/.git_keep/info/exclude rename to test/integration/squash/expected/repo/.git_keep/info/exclude diff --git a/test/integration/squash/expected/.git_keep/logs/HEAD b/test/integration/squash/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/squash/expected/.git_keep/logs/HEAD rename to test/integration/squash/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/squash/expected/.git_keep/logs/refs/heads/master b/test/integration/squash/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/squash/expected/.git_keep/logs/refs/heads/master rename to test/integration/squash/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c b/test/integration/squash/expected/repo/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c rename to test/integration/squash/expected/repo/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/squash/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/squash/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/squash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/squash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 b/test/integration/squash/expected/repo/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 rename to test/integration/squash/expected/repo/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 diff --git a/test/integration/squash/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/squash/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 000000000..0a734f981 Binary files /dev/null and b/test/integration/squash/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce differ diff --git a/test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/squash/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 rename to test/integration/squash/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/squash/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be rename to test/integration/squash/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be diff --git a/test/integration/squash/expected/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 b/test/integration/squash/expected/repo/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 rename to test/integration/squash/expected/repo/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 diff --git a/test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/squash/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f rename to test/integration/squash/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f diff --git a/test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 b/test/integration/squash/expected/repo/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 rename to test/integration/squash/expected/repo/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 diff --git a/test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 b/test/integration/squash/expected/repo/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 rename to test/integration/squash/expected/repo/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 diff --git a/test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 b/test/integration/squash/expected/repo/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 rename to test/integration/squash/expected/repo/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 diff --git a/test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 b/test/integration/squash/expected/repo/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 rename to test/integration/squash/expected/repo/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/squash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/squash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/squash/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/squash/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 b/test/integration/squash/expected/repo/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 similarity index 100% rename from test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 rename to test/integration/squash/expected/repo/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 diff --git a/test/integration/squash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/squash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 000000000..d39fa7d2f Binary files /dev/null and b/test/integration/squash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 differ diff --git a/test/integration/tags3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/squash/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/squash/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/squash/expected/.git_keep/refs/heads/master b/test/integration/squash/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/squash/expected/.git_keep/refs/heads/master rename to test/integration/squash/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/submoduleAdd/expected/haha/myfile1 b/test/integration/squash/expected/repo/myfile1 similarity index 100% rename from test/integration/submoduleAdd/expected/haha/myfile1 rename to test/integration/squash/expected/repo/myfile1 diff --git a/test/integration/submoduleAdd/expected/haha/myfile2 b/test/integration/squash/expected/repo/myfile2 similarity index 100% rename from test/integration/submoduleAdd/expected/haha/myfile2 rename to test/integration/squash/expected/repo/myfile2 diff --git a/test/integration/squash/expected/myfile3 b/test/integration/squash/expected/repo/myfile3 similarity index 100% rename from test/integration/squash/expected/myfile3 rename to test/integration/squash/expected/repo/myfile3 diff --git a/test/integration/squash/expected/myfile5 b/test/integration/squash/expected/repo/myfile5 similarity index 100% rename from test/integration/squash/expected/myfile5 rename to test/integration/squash/expected/repo/myfile5 diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/COMMIT_EDITMSG b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/FETCH_HEAD b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/FETCH_HEAD rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/stagingTwo/expected/.git_keep/HEAD b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/HEAD rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/HEAD diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/config b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/config similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/config rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/config diff --git a/test/integration/stagingTwo/expected/.git_keep/description b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/description similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/description rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/description diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/index b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/index similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/index rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/index diff --git a/test/integration/stagingTwo/expected/.git_keep/info/exclude b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/info/exclude rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/info/exclude diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/logs/HEAD b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/logs/HEAD rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/logs/refs/heads/master b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/logs/refs/heads/master rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/objects/18/54ab416d299cda0227d62b9ab0765e5551ef57 b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/18/54ab416d299cda0227d62b9ab0765e5551ef57 similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/objects/18/54ab416d299cda0227d62b9ab0765e5551ef57 rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/18/54ab416d299cda0227d62b9ab0765e5551ef57 diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/objects/2c/484c0a45f3726375600319f73978221a74b783 b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/2c/484c0a45f3726375600319f73978221a74b783 similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/objects/2c/484c0a45f3726375600319f73978221a74b783 rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/2c/484c0a45f3726375600319f73978221a74b783 diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/objects/8a/af931e5367e5af9d2e2c014800d22190352b14 b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/8a/af931e5367e5af9d2e2c014800d22190352b14 similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/objects/8a/af931e5367e5af9d2e2c014800d22190352b14 rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/8a/af931e5367e5af9d2e2c014800d22190352b14 diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/objects/fd/c28832bb15c80146150a24a018088c9df4f8cd b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/fd/c28832bb15c80146150a24a018088c9df4f8cd similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/objects/fd/c28832bb15c80146150a24a018088c9df4f8cd rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/objects/fd/c28832bb15c80146150a24a018088c9df4f8cd diff --git a/test/integration/staginWithDiffContextChange/expected/.git_keep/refs/heads/master b/test/integration/staginWithDiffContextChange/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/.git_keep/refs/heads/master rename to test/integration/staginWithDiffContextChange/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/staginWithDiffContextChange/expected/one.txt b/test/integration/staginWithDiffContextChange/expected/repo/one.txt similarity index 100% rename from test/integration/staginWithDiffContextChange/expected/one.txt rename to test/integration/staginWithDiffContextChange/expected/repo/one.txt diff --git a/test/integration/staginWithDiffContextChange/setup.sh b/test/integration/staginWithDiffContextChange/setup.sh index ac450f8d2..9b1f6fb8c 100644 --- a/test/integration/staginWithDiffContextChange/setup.sh +++ b/test/integration/staginWithDiffContextChange/setup.sh @@ -9,8 +9,8 @@ git init git config user.email "CI@example.com" git config user.name "CI" -cp ../files/one.txt one.txt +cp ../../files/one.txt one.txt git add . git commit -am file1 -cp ../files/one_new.txt one.txt +cp ../../files/one_new.txt one.txt diff --git a/test/integration/staging/expected/.git_keep/COMMIT_EDITMSG b/test/integration/staging/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/staging/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/staging/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/staging/expected/.git_keep/FETCH_HEAD b/test/integration/staging/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/staging/expected/.git_keep/FETCH_HEAD rename to test/integration/staging/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/stash/expected/.git_keep/HEAD b/test/integration/staging/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/stash/expected/.git_keep/HEAD rename to test/integration/staging/expected/repo/.git_keep/HEAD diff --git a/test/integration/staging/expected/.git_keep/config b/test/integration/staging/expected/repo/.git_keep/config similarity index 100% rename from test/integration/staging/expected/.git_keep/config rename to test/integration/staging/expected/repo/.git_keep/config diff --git a/test/integration/stash/expected/.git_keep/description b/test/integration/staging/expected/repo/.git_keep/description similarity index 100% rename from test/integration/stash/expected/.git_keep/description rename to test/integration/staging/expected/repo/.git_keep/description diff --git a/test/integration/staging/expected/.git_keep/index b/test/integration/staging/expected/repo/.git_keep/index similarity index 100% rename from test/integration/staging/expected/.git_keep/index rename to test/integration/staging/expected/repo/.git_keep/index diff --git a/test/integration/stash/expected/.git_keep/info/exclude b/test/integration/staging/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/stash/expected/.git_keep/info/exclude rename to test/integration/staging/expected/repo/.git_keep/info/exclude diff --git a/test/integration/staging/expected/.git_keep/logs/HEAD b/test/integration/staging/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/staging/expected/.git_keep/logs/HEAD rename to test/integration/staging/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/staging/expected/.git_keep/logs/refs/heads/master b/test/integration/staging/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/staging/expected/.git_keep/logs/refs/heads/master rename to test/integration/staging/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/staging/expected/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5f b/test/integration/staging/expected/repo/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5f similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5f rename to test/integration/staging/expected/repo/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5f diff --git a/test/integration/staging/expected/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59e b/test/integration/staging/expected/repo/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59e similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59e rename to test/integration/staging/expected/repo/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59e diff --git a/test/integration/staging/expected/.git_keep/objects/12/c4186053ecd4056526743060a8fe87429b7306 b/test/integration/staging/expected/repo/.git_keep/objects/12/c4186053ecd4056526743060a8fe87429b7306 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/12/c4186053ecd4056526743060a8fe87429b7306 rename to test/integration/staging/expected/repo/.git_keep/objects/12/c4186053ecd4056526743060a8fe87429b7306 diff --git a/test/integration/staging/expected/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817e b/test/integration/staging/expected/repo/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817e similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817e rename to test/integration/staging/expected/repo/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817e diff --git a/test/integration/staging/expected/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95 b/test/integration/staging/expected/repo/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95 rename to test/integration/staging/expected/repo/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95 diff --git a/test/integration/staging/expected/.git_keep/objects/63/5b45efaba0c2415658bc121de201ec43a47920 b/test/integration/staging/expected/repo/.git_keep/objects/63/5b45efaba0c2415658bc121de201ec43a47920 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/63/5b45efaba0c2415658bc121de201ec43a47920 rename to test/integration/staging/expected/repo/.git_keep/objects/63/5b45efaba0c2415658bc121de201ec43a47920 diff --git a/test/integration/staging/expected/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66 b/test/integration/staging/expected/repo/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66 rename to test/integration/staging/expected/repo/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66 diff --git a/test/integration/staging/expected/.git_keep/objects/79/8369253f104fe8cdc91db6f7d3525be532218e b/test/integration/staging/expected/repo/.git_keep/objects/79/8369253f104fe8cdc91db6f7d3525be532218e similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/79/8369253f104fe8cdc91db6f7d3525be532218e rename to test/integration/staging/expected/repo/.git_keep/objects/79/8369253f104fe8cdc91db6f7d3525be532218e diff --git a/test/integration/staging/expected/.git_keep/objects/a0/425534134de68284a0a7250b83b0e6303f0ed7 b/test/integration/staging/expected/repo/.git_keep/objects/a0/425534134de68284a0a7250b83b0e6303f0ed7 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/a0/425534134de68284a0a7250b83b0e6303f0ed7 rename to test/integration/staging/expected/repo/.git_keep/objects/a0/425534134de68284a0a7250b83b0e6303f0ed7 diff --git a/test/integration/staging/expected/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626b b/test/integration/staging/expected/repo/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626b similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626b rename to test/integration/staging/expected/repo/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626b diff --git a/test/integration/staging/expected/.git_keep/objects/a4/8a7caa799e7859b8f21d373e3f01b06002d42f b/test/integration/staging/expected/repo/.git_keep/objects/a4/8a7caa799e7859b8f21d373e3f01b06002d42f similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/a4/8a7caa799e7859b8f21d373e3f01b06002d42f rename to test/integration/staging/expected/repo/.git_keep/objects/a4/8a7caa799e7859b8f21d373e3f01b06002d42f diff --git a/test/integration/staging/expected/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c0 b/test/integration/staging/expected/repo/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c0 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c0 rename to test/integration/staging/expected/repo/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c0 diff --git a/test/integration/staging/expected/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82 b/test/integration/staging/expected/repo/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82 rename to test/integration/staging/expected/repo/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82 diff --git a/test/integration/staging/expected/.git_keep/objects/e8/aaa2f356eb341c693e239467fd200d0117b487 b/test/integration/staging/expected/repo/.git_keep/objects/e8/aaa2f356eb341c693e239467fd200d0117b487 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/e8/aaa2f356eb341c693e239467fd200d0117b487 rename to test/integration/staging/expected/repo/.git_keep/objects/e8/aaa2f356eb341c693e239467fd200d0117b487 diff --git a/test/integration/staging/expected/.git_keep/objects/fb/e09a11933b44ea60b46bd0f3d44142cb6189a4 b/test/integration/staging/expected/repo/.git_keep/objects/fb/e09a11933b44ea60b46bd0f3d44142cb6189a4 similarity index 100% rename from test/integration/staging/expected/.git_keep/objects/fb/e09a11933b44ea60b46bd0f3d44142cb6189a4 rename to test/integration/staging/expected/repo/.git_keep/objects/fb/e09a11933b44ea60b46bd0f3d44142cb6189a4 diff --git a/test/integration/staging/expected/.git_keep/refs/heads/master b/test/integration/staging/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/staging/expected/.git_keep/refs/heads/master rename to test/integration/staging/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/staging/expected/one.txt b/test/integration/staging/expected/repo/one.txt similarity index 100% rename from test/integration/staging/expected/one.txt rename to test/integration/staging/expected/repo/one.txt diff --git a/test/integration/staging/expected/three.txt b/test/integration/staging/expected/repo/three.txt similarity index 100% rename from test/integration/staging/expected/three.txt rename to test/integration/staging/expected/repo/three.txt diff --git a/test/integration/staging/expected/two.txt b/test/integration/staging/expected/repo/two.txt similarity index 100% rename from test/integration/staging/expected/two.txt rename to test/integration/staging/expected/repo/two.txt diff --git a/test/integration/staging/setup.sh b/test/integration/staging/setup.sh index 5ede99e27..da73083d2 100644 --- a/test/integration/staging/setup.sh +++ b/test/integration/staging/setup.sh @@ -7,12 +7,12 @@ git init git config user.email "CI@example.com" git config user.name "CI" -cp ../files/one.txt one.txt -cp ../files/two.txt two.txt -cp ../files/three.txt three.txt +cp ../../files/one.txt one.txt +cp ../../files/two.txt two.txt +cp ../../files/three.txt three.txt git add . git commit -am file1 -cp ../files/one_new.txt one.txt -cp ../files/two_new.txt two.txt -cp ../files/three_new.txt three.txt +cp ../../files/one_new.txt one.txt +cp ../../files/two_new.txt two.txt +cp ../../files/three_new.txt three.txt diff --git a/test/integration/stagingTwo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stagingTwo/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/stagingTwo/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/stagingTwo/expected/.git_keep/FETCH_HEAD b/test/integration/stagingTwo/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/FETCH_HEAD rename to test/integration/stagingTwo/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/stashDrop/expected/.git_keep/HEAD b/test/integration/stagingTwo/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/HEAD rename to test/integration/stagingTwo/expected/repo/.git_keep/HEAD diff --git a/test/integration/stagingTwo/expected/.git_keep/config b/test/integration/stagingTwo/expected/repo/.git_keep/config similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/config rename to test/integration/stagingTwo/expected/repo/.git_keep/config diff --git a/test/integration/stashDrop/expected/.git_keep/description b/test/integration/stagingTwo/expected/repo/.git_keep/description similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/description rename to test/integration/stagingTwo/expected/repo/.git_keep/description diff --git a/test/integration/stagingTwo/expected/.git_keep/index b/test/integration/stagingTwo/expected/repo/.git_keep/index similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/index rename to test/integration/stagingTwo/expected/repo/.git_keep/index diff --git a/test/integration/stashDrop/expected/.git_keep/info/exclude b/test/integration/stagingTwo/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/info/exclude rename to test/integration/stagingTwo/expected/repo/.git_keep/info/exclude diff --git a/test/integration/stagingTwo/expected/.git_keep/logs/HEAD b/test/integration/stagingTwo/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/logs/HEAD rename to test/integration/stagingTwo/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/stagingTwo/expected/.git_keep/logs/refs/heads/master b/test/integration/stagingTwo/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/logs/refs/heads/master rename to test/integration/stagingTwo/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/stagingTwo/expected/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e b/test/integration/stagingTwo/expected/repo/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e rename to test/integration/stagingTwo/expected/repo/.git_keep/objects/15/8e9a9c1a9627ea0ef4de8b00a503ed0f80a09e diff --git a/test/integration/stagingTwo/expected/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f b/test/integration/stagingTwo/expected/repo/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f rename to test/integration/stagingTwo/expected/repo/.git_keep/objects/7b/9c2149f16c706cea79b03234cb67fde7e9b68f diff --git a/test/integration/stagingTwo/expected/.git_keep/objects/f7/93cf3fd99464dbd3499093e95197229b771b11 b/test/integration/stagingTwo/expected/repo/.git_keep/objects/f7/93cf3fd99464dbd3499093e95197229b771b11 similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/objects/f7/93cf3fd99464dbd3499093e95197229b771b11 rename to test/integration/stagingTwo/expected/repo/.git_keep/objects/f7/93cf3fd99464dbd3499093e95197229b771b11 diff --git a/test/integration/stagingTwo/expected/.git_keep/refs/heads/master b/test/integration/stagingTwo/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/stagingTwo/expected/.git_keep/refs/heads/master rename to test/integration/stagingTwo/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/stagingTwo/expected/one.txt b/test/integration/stagingTwo/expected/repo/one.txt similarity index 100% rename from test/integration/stagingTwo/expected/one.txt rename to test/integration/stagingTwo/expected/repo/one.txt diff --git a/test/integration/stagingTwo/setup.sh b/test/integration/stagingTwo/setup.sh index ac450f8d2..9b1f6fb8c 100644 --- a/test/integration/stagingTwo/setup.sh +++ b/test/integration/stagingTwo/setup.sh @@ -9,8 +9,8 @@ git init git config user.email "CI@example.com" git config user.name "CI" -cp ../files/one.txt one.txt +cp ../../files/one.txt one.txt git add . git commit -am file1 -cp ../files/one_new.txt one.txt +cp ../../files/one_new.txt one.txt diff --git a/test/integration/stash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stash/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/stash/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/stash/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/stash/expected/.git_keep/FETCH_HEAD b/test/integration/stash/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/stash/expected/.git_keep/FETCH_HEAD rename to test/integration/stash/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/stashPop/expected/.git_keep/HEAD b/test/integration/stash/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/stashPop/expected/.git_keep/HEAD rename to test/integration/stash/expected/repo/.git_keep/HEAD diff --git a/test/integration/stash/expected/.git_keep/ORIG_HEAD b/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/stash/expected/.git_keep/ORIG_HEAD rename to test/integration/stash/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/stash/expected/.git_keep/config b/test/integration/stash/expected/repo/.git_keep/config similarity index 100% rename from test/integration/stash/expected/.git_keep/config rename to test/integration/stash/expected/repo/.git_keep/config diff --git a/test/integration/stashNewBranch/expected/.git_keep/description b/test/integration/stash/expected/repo/.git_keep/description similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/description rename to test/integration/stash/expected/repo/.git_keep/description diff --git a/test/integration/stash/expected/.git_keep/index b/test/integration/stash/expected/repo/.git_keep/index similarity index 100% rename from test/integration/stash/expected/.git_keep/index rename to test/integration/stash/expected/repo/.git_keep/index diff --git a/test/integration/stashNewBranch/expected/.git_keep/info/exclude b/test/integration/stash/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/info/exclude rename to test/integration/stash/expected/repo/.git_keep/info/exclude diff --git a/test/integration/stash/expected/.git_keep/logs/HEAD b/test/integration/stash/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/stash/expected/.git_keep/logs/HEAD rename to test/integration/stash/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/stash/expected/.git_keep/logs/refs/heads/master b/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/stash/expected/.git_keep/logs/refs/heads/master rename to test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/stash/expected/.git_keep/logs/refs/stash b/test/integration/stash/expected/repo/.git_keep/logs/refs/stash similarity index 100% rename from test/integration/stash/expected/.git_keep/logs/refs/stash rename to test/integration/stash/expected/repo/.git_keep/logs/refs/stash diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/stash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/stash/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/stash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/stash/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc b/test/integration/stash/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc rename to test/integration/stash/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc diff --git a/test/integration/stash/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe b/test/integration/stash/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe rename to test/integration/stash/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe diff --git a/test/integration/stash/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/stash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/stash/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a b/test/integration/stash/expected/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a rename to test/integration/stash/expected/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a diff --git a/test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d b/test/integration/stash/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d rename to test/integration/stash/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d diff --git a/test/integration/stash/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stash/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 rename to test/integration/stash/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 diff --git a/test/integration/stash/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stash/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 rename to test/integration/stash/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 diff --git a/test/integration/stash/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stash/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 rename to test/integration/stash/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 diff --git a/test/integration/stash/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stash/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/stash/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/stash/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stash/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c rename to test/integration/stash/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/stash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 b/test/integration/stash/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 rename to test/integration/stash/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 diff --git a/test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b b/test/integration/stash/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b rename to test/integration/stash/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b diff --git a/test/integration/stash/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stash/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a rename to test/integration/stash/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a diff --git a/test/integration/stash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stash/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/stash/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 b/test/integration/stash/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 rename to test/integration/stash/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 diff --git a/test/integration/stash/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 b/test/integration/stash/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 similarity index 100% rename from test/integration/stash/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 rename to test/integration/stash/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash/expected/.git_keep/refs/heads/master b/test/integration/stash/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/stash/expected/.git_keep/refs/heads/master rename to test/integration/stash/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/stash/expected/.git_keep/refs/stash b/test/integration/stash/expected/repo/.git_keep/refs/stash similarity index 100% rename from test/integration/stash/expected/.git_keep/refs/stash rename to test/integration/stash/expected/repo/.git_keep/refs/stash diff --git a/test/integration/stash/expected/file0 b/test/integration/stash/expected/repo/file0 similarity index 100% rename from test/integration/stash/expected/file0 rename to test/integration/stash/expected/repo/file0 diff --git a/test/integration/stash/expected/file1 b/test/integration/stash/expected/repo/file1 similarity index 100% rename from test/integration/stash/expected/file1 rename to test/integration/stash/expected/repo/file1 diff --git a/test/integration/stash/expected/file2 b/test/integration/stash/expected/repo/file2 similarity index 100% rename from test/integration/stash/expected/file2 rename to test/integration/stash/expected/repo/file2 diff --git a/test/integration/stashDrop/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashDrop/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/stashDrop/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/stashDrop/expected/.git_keep/FETCH_HEAD b/test/integration/stashDrop/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/FETCH_HEAD rename to test/integration/stashDrop/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/stash_Copy/expected/.git_keep/HEAD b/test/integration/stashDrop/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/HEAD rename to test/integration/stashDrop/expected/repo/.git_keep/HEAD diff --git a/test/integration/stashDrop/expected/.git_keep/ORIG_HEAD b/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/ORIG_HEAD rename to test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/stashDrop/expected/.git_keep/config b/test/integration/stashDrop/expected/repo/.git_keep/config similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/config rename to test/integration/stashDrop/expected/repo/.git_keep/config diff --git a/test/integration/stashPop/expected/.git_keep/description b/test/integration/stashDrop/expected/repo/.git_keep/description similarity index 100% rename from test/integration/stashPop/expected/.git_keep/description rename to test/integration/stashDrop/expected/repo/.git_keep/description diff --git a/test/integration/stashDrop/expected/.git_keep/index b/test/integration/stashDrop/expected/repo/.git_keep/index similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/index rename to test/integration/stashDrop/expected/repo/.git_keep/index diff --git a/test/integration/stashPop/expected/.git_keep/info/exclude b/test/integration/stashDrop/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/stashPop/expected/.git_keep/info/exclude rename to test/integration/stashDrop/expected/repo/.git_keep/info/exclude diff --git a/test/integration/stashDrop/expected/.git_keep/logs/HEAD b/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/logs/HEAD rename to test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master b/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/logs/refs/heads/master rename to test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/stashDrop/expected/.git_keep/logs/refs/stash b/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/stash similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/logs/refs/stash rename to test/integration/stashDrop/expected/repo/.git_keep/logs/refs/stash diff --git a/test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b b/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b rename to test/integration/stashDrop/expected/repo/.git_keep/objects/1e/6f4a55f3dd26848238337763f249681ef9397b diff --git a/test/integration/stashDrop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashDrop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/stashDrop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/stashDrop/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stashDrop/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashDrop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashDrop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 b/test/integration/stashDrop/expected/repo/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/6d/c07da80aed51d01a56a89ef37f4411adbd75c5 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 b/test/integration/stashDrop/expected/repo/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/76/05fecac5dee01fb9df55ca984dcc7a72810f48 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashDrop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/stashDrop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/stashDrop/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stashDrop/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c rename to test/integration/stashDrop/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c diff --git a/test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashDrop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac b/test/integration/stashDrop/expected/repo/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac rename to test/integration/stashDrop/expected/repo/.git_keep/objects/a6/ed180e13649885eed39866051ca0e25c0ad6ac diff --git a/test/integration/stashDrop/expected/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 b/test/integration/stashDrop/expected/repo/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/c0/0c9eb1ae239494475772c3f3dbae5ea4169575 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashDrop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a rename to test/integration/stashDrop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a diff --git a/test/integration/stashDrop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashDrop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 b/test/integration/stashDrop/expected/repo/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/d2/2496528fe3c076a668c496ae7ba1f8136f1614 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b b/test/integration/stashDrop/expected/repo/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b rename to test/integration/stashDrop/expected/repo/.git_keep/objects/e0/61c8716830532562f919dcb125ea804f87ca2b diff --git a/test/integration/stashDrop/expected/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 b/test/integration/stashDrop/expected/repo/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/e5/cef1a548f3613b3e538bd0fc2b4ec88043fc25 diff --git a/test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 b/test/integration/stashDrop/expected/repo/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 rename to test/integration/stashDrop/expected/repo/.git_keep/objects/f4/f81b6542e98a2f80269449674b0f8f454b74b0 diff --git a/test/integration/stashDrop/expected/.git_keep/refs/heads/master b/test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/refs/heads/master rename to test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/stashDrop/expected/.git_keep/refs/stash b/test/integration/stashDrop/expected/repo/.git_keep/refs/stash similarity index 100% rename from test/integration/stashDrop/expected/.git_keep/refs/stash rename to test/integration/stashDrop/expected/repo/.git_keep/refs/stash diff --git a/test/integration/stashDrop/expected/file0 b/test/integration/stashDrop/expected/repo/file0 similarity index 100% rename from test/integration/stashDrop/expected/file0 rename to test/integration/stashDrop/expected/repo/file0 diff --git a/test/integration/stashDrop/expected/file1 b/test/integration/stashDrop/expected/repo/file1 similarity index 100% rename from test/integration/stashDrop/expected/file1 rename to test/integration/stashDrop/expected/repo/file1 diff --git a/test/integration/stashDrop/expected/file2 b/test/integration/stashDrop/expected/repo/file2 similarity index 100% rename from test/integration/stashDrop/expected/file2 rename to test/integration/stashDrop/expected/repo/file2 diff --git a/test/integration/stashNewBranch/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashNewBranch/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/stashNewBranch/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/stashNewBranch/expected/.git_keep/FETCH_HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/FETCH_HEAD rename to test/integration/stashNewBranch/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/stashNewBranch/expected/.git_keep/HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/HEAD rename to test/integration/stashNewBranch/expected/repo/.git_keep/HEAD diff --git a/test/integration/stashNewBranch/expected/.git_keep/ORIG_HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/ORIG_HEAD rename to test/integration/stashNewBranch/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/stashNewBranch/expected/.git_keep/config b/test/integration/stashNewBranch/expected/repo/.git_keep/config similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/config rename to test/integration/stashNewBranch/expected/repo/.git_keep/config diff --git a/test/integration/stash_Copy/expected/.git_keep/description b/test/integration/stashNewBranch/expected/repo/.git_keep/description similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/description rename to test/integration/stashNewBranch/expected/repo/.git_keep/description diff --git a/test/integration/stashNewBranch/expected/.git_keep/index b/test/integration/stashNewBranch/expected/repo/.git_keep/index similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/index rename to test/integration/stashNewBranch/expected/repo/.git_keep/index diff --git a/test/integration/stash_Copy/expected/.git_keep/info/exclude b/test/integration/stashNewBranch/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/info/exclude rename to test/integration/stashNewBranch/expected/repo/.git_keep/info/exclude diff --git a/test/integration/stashNewBranch/expected/.git_keep/logs/HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/logs/HEAD rename to test/integration/stashNewBranch/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/hello b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/hello similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/hello rename to test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/hello diff --git a/test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/master b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/logs/refs/heads/master rename to test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/stashNewBranch/expected/.git_keep/logs/refs/stash b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/stash similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/logs/refs/stash rename to test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/stash diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a diff --git a/test/integration/stashNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/stashNewBranch/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/stashNewBranch/expected/.git_keep/refs/heads/hello b/test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/hello similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/refs/heads/hello rename to test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/hello diff --git a/test/integration/stashNewBranch/expected/.git_keep/refs/heads/master b/test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/refs/heads/master rename to test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/stashNewBranch/expected/.git_keep/refs/stash b/test/integration/stashNewBranch/expected/repo/.git_keep/refs/stash similarity index 100% rename from test/integration/stashNewBranch/expected/.git_keep/refs/stash rename to test/integration/stashNewBranch/expected/repo/.git_keep/refs/stash diff --git a/test/integration/stashNewBranch/expected/file0 b/test/integration/stashNewBranch/expected/repo/file0 similarity index 100% rename from test/integration/stashNewBranch/expected/file0 rename to test/integration/stashNewBranch/expected/repo/file0 diff --git a/test/integration/stashNewBranch/expected/file1 b/test/integration/stashNewBranch/expected/repo/file1 similarity index 100% rename from test/integration/stashNewBranch/expected/file1 rename to test/integration/stashNewBranch/expected/repo/file1 diff --git a/test/integration/stashNewBranch/expected/file2 b/test/integration/stashNewBranch/expected/repo/file2 similarity index 100% rename from test/integration/stashNewBranch/expected/file2 rename to test/integration/stashNewBranch/expected/repo/file2 diff --git a/test/integration/stashNewBranch/expected/file3 b/test/integration/stashNewBranch/expected/repo/file3 similarity index 100% rename from test/integration/stashNewBranch/expected/file3 rename to test/integration/stashNewBranch/expected/repo/file3 diff --git a/test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stashPop/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/stashPop/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/stashPop/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/stashPop/expected/.git_keep/FETCH_HEAD b/test/integration/stashPop/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/stashPop/expected/.git_keep/FETCH_HEAD rename to test/integration/stashPop/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/submoduleAdd/expected/.git_keep/HEAD b/test/integration/stashPop/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/HEAD rename to test/integration/stashPop/expected/repo/.git_keep/HEAD diff --git a/test/integration/stashPop/expected/.git_keep/ORIG_HEAD b/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/stashPop/expected/.git_keep/ORIG_HEAD rename to test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/stashPop/expected/.git_keep/config b/test/integration/stashPop/expected/repo/.git_keep/config similarity index 100% rename from test/integration/stashPop/expected/.git_keep/config rename to test/integration/stashPop/expected/repo/.git_keep/config diff --git a/test/integration/submoduleAdd/expected/.git_keep/description b/test/integration/stashPop/expected/repo/.git_keep/description similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/description rename to test/integration/stashPop/expected/repo/.git_keep/description diff --git a/test/integration/stashPop/expected/.git_keep/index b/test/integration/stashPop/expected/repo/.git_keep/index similarity index 100% rename from test/integration/stashPop/expected/.git_keep/index rename to test/integration/stashPop/expected/repo/.git_keep/index diff --git a/test/integration/submoduleAdd/expected/.git_keep/info/exclude b/test/integration/stashPop/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/info/exclude rename to test/integration/stashPop/expected/repo/.git_keep/info/exclude diff --git a/test/integration/stashPop/expected/.git_keep/logs/HEAD b/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/stashPop/expected/.git_keep/logs/HEAD rename to test/integration/stashPop/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/stashPop/expected/.git_keep/logs/refs/heads/master b/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/stashPop/expected/.git_keep/logs/refs/heads/master rename to test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/stashPop/expected/.git_keep/logs/refs/stash b/test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash similarity index 100% rename from test/integration/stashPop/expected/.git_keep/logs/refs/stash rename to test/integration/stashPop/expected/repo/.git_keep/logs/refs/stash diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashPop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/stashPop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashPop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/stashPop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/stashPop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashPop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/stashPop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 b/test/integration/stashPop/expected/repo/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 rename to test/integration/stashPop/expected/repo/.git_keep/objects/3a/e4e5d4920afbb1bac23426afb237524c8dbe41 diff --git a/test/integration/stashPop/expected/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a b/test/integration/stashPop/expected/repo/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a rename to test/integration/stashPop/expected/repo/.git_keep/objects/43/7b9b0ca941f1e12c8b45958f5d6ebd11cdd41a diff --git a/test/integration/stashPop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashPop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 rename to test/integration/stashPop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 diff --git a/test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashPop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 rename to test/integration/stashPop/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 diff --git a/test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 b/test/integration/stashPop/expected/repo/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 rename to test/integration/stashPop/expected/repo/.git_keep/objects/82/cc524693ae9fb40af0ed8ab7e22581084dcd17 diff --git a/test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac b/test/integration/stashPop/expected/repo/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac rename to test/integration/stashPop/expected/repo/.git_keep/objects/86/34432ef171aa4b8d8e688fc1e5645245bf36ac diff --git a/test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b b/test/integration/stashPop/expected/repo/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b rename to test/integration/stashPop/expected/repo/.git_keep/objects/8b/081dcb0e1fd5e9862d1aa6891b805b101abe7b diff --git a/test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 b/test/integration/stashPop/expected/repo/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 rename to test/integration/stashPop/expected/repo/.git_keep/objects/8b/d86c566a91e9f8ace9883f7017f562c971b3f7 diff --git a/test/integration/stashPop/expected/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stashPop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 rename to test/integration/stashPop/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 diff --git a/test/integration/stashPop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashPop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/stashPop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashPop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/stashPop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e b/test/integration/stashPop/expected/repo/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e rename to test/integration/stashPop/expected/repo/.git_keep/objects/b0/00623a052b4d2226c43ba396b830738799740e diff --git a/test/integration/stashPop/expected/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 b/test/integration/stashPop/expected/repo/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 rename to test/integration/stashPop/expected/repo/.git_keep/objects/c6/a8d49b926afc9ff2b4c64398ee678c50c2c953 diff --git a/test/integration/stashPop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashPop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a rename to test/integration/stashPop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a diff --git a/test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashPop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/stashPop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c b/test/integration/stashPop/expected/repo/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c similarity index 100% rename from test/integration/stashPop/expected/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c rename to test/integration/stashPop/expected/repo/.git_keep/objects/e0/0e994a4acb98bcbe93ad478e09dcb3bed6b26c diff --git a/test/integration/stashPop/expected/.git_keep/refs/heads/master b/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/stashPop/expected/.git_keep/refs/heads/master rename to test/integration/stashPop/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/stashPop/expected/.git_keep/refs/stash b/test/integration/stashPop/expected/repo/.git_keep/refs/stash similarity index 100% rename from test/integration/stashPop/expected/.git_keep/refs/stash rename to test/integration/stashPop/expected/repo/.git_keep/refs/stash diff --git a/test/integration/stashPop/expected/file0 b/test/integration/stashPop/expected/repo/file0 similarity index 100% rename from test/integration/stashPop/expected/file0 rename to test/integration/stashPop/expected/repo/file0 diff --git a/test/integration/stashPop/expected/file1 b/test/integration/stashPop/expected/repo/file1 similarity index 100% rename from test/integration/stashPop/expected/file1 rename to test/integration/stashPop/expected/repo/file1 diff --git a/test/integration/stashPop/expected/file2 b/test/integration/stashPop/expected/repo/file2 similarity index 100% rename from test/integration/stashPop/expected/file2 rename to test/integration/stashPop/expected/repo/file2 diff --git a/test/integration/stashPop/expected/file3 b/test/integration/stashPop/expected/repo/file3 similarity index 100% rename from test/integration/stashPop/expected/file3 rename to test/integration/stashPop/expected/repo/file3 diff --git a/test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG b/test/integration/stash_Copy/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/stash_Copy/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/stash_Copy/expected/.git_keep/FETCH_HEAD b/test/integration/stash_Copy/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/FETCH_HEAD rename to test/integration/stash_Copy/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/HEAD b/test/integration/stash_Copy/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/HEAD rename to test/integration/stash_Copy/expected/repo/.git_keep/HEAD diff --git a/test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD b/test/integration/stash_Copy/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/ORIG_HEAD rename to test/integration/stash_Copy/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/stash_Copy/expected/.git_keep/config b/test/integration/stash_Copy/expected/repo/.git_keep/config similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/config rename to test/integration/stash_Copy/expected/repo/.git_keep/config diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/description b/test/integration/stash_Copy/expected/repo/.git_keep/description similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/description rename to test/integration/stash_Copy/expected/repo/.git_keep/description diff --git a/test/integration/stash_Copy/expected/.git_keep/index b/test/integration/stash_Copy/expected/repo/.git_keep/index similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/index rename to test/integration/stash_Copy/expected/repo/.git_keep/index diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/info/exclude b/test/integration/stash_Copy/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/info/exclude rename to test/integration/stash_Copy/expected/repo/.git_keep/info/exclude diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/HEAD b/test/integration/stash_Copy/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/logs/HEAD rename to test/integration/stash_Copy/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master b/test/integration/stash_Copy/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/logs/refs/heads/master rename to test/integration/stash_Copy/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/stash_Copy/expected/.git_keep/logs/refs/stash b/test/integration/stash_Copy/expected/repo/.git_keep/logs/refs/stash similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/logs/refs/stash rename to test/integration/stash_Copy/expected/repo/.git_keep/logs/refs/stash diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc b/test/integration/stash_Copy/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/25/abc3e66a6aa505fb0a2ceb6ad5cda0cc89ecbc diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe b/test/integration/stash_Copy/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/2e/fac8148440778cbddcd80ac7477981277dcffe diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stash_Copy/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a b/test/integration/stash_Copy/expected/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/3b/29b35d4357f8e64cafd95140a70d7c9b25138a diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d b/test/integration/stash_Copy/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/4c/c838ea1466afc5be1d3bc3e7a937641ec84d7d diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stash_Copy/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c b/test/integration/stash_Copy/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/9f/2757166809c291c65f09778abb46cfcc4e4a0c diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/a6/ada9f3d895e751ec289c69913a02146c0ca844 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b b/test/integration/stash_Copy/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/a7/dde526f2e93ffa08897fbfca2c98ce40a8fa5b diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stash_Copy/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/e0/9b4dfcd66bfa1c81feeaf67e04d55368a2b065 diff --git a/test/integration/stash_Copy/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 b/test/integration/stash_Copy/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 rename to test/integration/stash_Copy/expected/repo/.git_keep/objects/f3/48ff60bdbb3695f2f519db6bc115b1b8d50886 diff --git a/test/integration/stash_Copy/expected/.git_keep/refs/heads/master b/test/integration/stash_Copy/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/refs/heads/master rename to test/integration/stash_Copy/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/stash_Copy/expected/.git_keep/refs/stash b/test/integration/stash_Copy/expected/repo/.git_keep/refs/stash similarity index 100% rename from test/integration/stash_Copy/expected/.git_keep/refs/stash rename to test/integration/stash_Copy/expected/repo/.git_keep/refs/stash diff --git a/test/integration/stash_Copy/expected/file0 b/test/integration/stash_Copy/expected/repo/file0 similarity index 100% rename from test/integration/stash_Copy/expected/file0 rename to test/integration/stash_Copy/expected/repo/file0 diff --git a/test/integration/stash_Copy/expected/file1 b/test/integration/stash_Copy/expected/repo/file1 similarity index 100% rename from test/integration/stash_Copy/expected/file1 rename to test/integration/stash_Copy/expected/repo/file1 diff --git a/test/integration/stash_Copy/expected/file2 b/test/integration/stash_Copy/expected/repo/file2 similarity index 100% rename from test/integration/stash_Copy/expected/file2 rename to test/integration/stash_Copy/expected/repo/file2 diff --git a/test/integration/submoduleAdd/expected/.git_keep/index b/test/integration/submoduleAdd/expected/.git_keep/index deleted file mode 100644 index df11fba0b..000000000 Binary files a/test/integration/submoduleAdd/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/index b/test/integration/submoduleAdd/expected/.git_keep/modules/blah/index deleted file mode 100644 index 64a52c781..000000000 Binary files a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/index and /dev/null differ diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/HEAD b/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/HEAD deleted file mode 100644 index 0ed3aba82..000000000 --- a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1617797593 +1000 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/other_repo diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/refs/heads/master b/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/refs/heads/master deleted file mode 100644 index 0ed3aba82..000000000 --- a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1617797593 +1000 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/other_repo diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD b/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 0ed3aba82..000000000 --- a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1617797593 +1000 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/other_repo diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/6d/e70e35394a99cc437d1bc70b0852b70c5bb03d b/test/integration/submoduleAdd/expected/.git_keep/objects/6d/e70e35394a99cc437d1bc70b0852b70c5bb03d deleted file mode 100644 index 8545bdc31..000000000 Binary files a/test/integration/submoduleAdd/expected/.git_keep/objects/6d/e70e35394a99cc437d1bc70b0852b70c5bb03d and /dev/null differ diff --git a/test/integration/submoduleAdd/expected/.git_keep/refs/heads/master b/test/integration/submoduleAdd/expected/.git_keep/refs/heads/master deleted file mode 100644 index d41df026f..000000000 --- a/test/integration/submoduleAdd/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -6de70e35394a99cc437d1bc70b0852b70c5bb03d diff --git a/test/integration/submoduleEnter/expected/.git_keep/HEAD b/test/integration/submoduleAdd/expected/other_repo/HEAD similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/HEAD rename to test/integration/submoduleAdd/expected/other_repo/HEAD diff --git a/test/integration/forcePushMultiple/expected_remote/config b/test/integration/submoduleAdd/expected/other_repo/config similarity index 77% rename from test/integration/forcePushMultiple/expected_remote/config rename to test/integration/submoduleAdd/expected/other_repo/config index c51ded5d7..e5abd1a6d 100644 --- a/test/integration/forcePushMultiple/expected_remote/config +++ b/test/integration/submoduleAdd/expected/other_repo/config @@ -5,4 +5,4 @@ ignorecase = true precomposeunicode = true [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePushMultiple/./actual + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/./repo diff --git a/test/integration/submoduleEnter/expected/.git_keep/description b/test/integration/submoduleAdd/expected/other_repo/description similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/description rename to test/integration/submoduleAdd/expected/other_repo/description diff --git a/test/integration/submoduleEnter/expected/.git_keep/info/exclude b/test/integration/submoduleAdd/expected/other_repo/info/exclude similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/info/exclude rename to test/integration/submoduleAdd/expected/other_repo/info/exclude diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleAdd/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/submoduleAdd/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleAdd/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleAdd/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleAdd/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e rename to test/integration/submoduleAdd/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleAdd/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 rename to test/integration/submoduleAdd/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleAdd/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleAdd/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleAdd/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/submoduleAdd/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/submoduleAdd/expected/other_repo/packed-refs b/test/integration/submoduleAdd/expected/other_repo/packed-refs new file mode 100644 index 000000000..62f6568b2 --- /dev/null +++ b/test/integration/submoduleAdd/expected/other_repo/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +42530e986dbb65877ed8d61ca0c816e425e5c62e refs/heads/master diff --git a/test/integration/submoduleAdd/expected/.git_keep/COMMIT_EDITMSG b/test/integration/submoduleAdd/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/submoduleAdd/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/submoduleAdd/expected/.git_keep/FETCH_HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/FETCH_HEAD rename to test/integration/submoduleAdd/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/HEAD rename to test/integration/submoduleAdd/expected/repo/.git_keep/HEAD diff --git a/test/integration/submoduleAdd/expected/.git_keep/config b/test/integration/submoduleAdd/expected/repo/.git_keep/config similarity index 82% rename from test/integration/submoduleAdd/expected/.git_keep/config rename to test/integration/submoduleAdd/expected/repo/.git_keep/config index 3770f8692..22f6527ea 100644 --- a/test/integration/submoduleAdd/expected/.git_keep/config +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/config @@ -9,5 +9,5 @@ email = CI@example.com name = CI [submodule "blah"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/other_repo + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo active = true diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/description b/test/integration/submoduleAdd/expected/repo/.git_keep/description similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/description rename to test/integration/submoduleAdd/expected/repo/.git_keep/description diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/index b/test/integration/submoduleAdd/expected/repo/.git_keep/index new file mode 100644 index 000000000..4690b27b1 Binary files /dev/null and b/test/integration/submoduleAdd/expected/repo/.git_keep/index differ diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/info/exclude b/test/integration/submoduleAdd/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/info/exclude rename to test/integration/submoduleAdd/expected/repo/.git_keep/info/exclude diff --git a/test/integration/submoduleAdd/expected/.git_keep/logs/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/logs/HEAD similarity index 68% rename from test/integration/submoduleAdd/expected/.git_keep/logs/HEAD rename to test/integration/submoduleAdd/expected/repo/.git_keep/logs/HEAD index df53976dc..58db0ace2 100644 --- a/test/integration/submoduleAdd/expected/.git_keep/logs/HEAD +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/logs/HEAD @@ -1,3 +1,3 @@ 0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI 1534792759 +0100 commit (initial): myfile1 a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 -42530e986dbb65877ed8d61ca0c816e425e5c62e 6de70e35394a99cc437d1bc70b0852b70c5bb03d CI 1617797593 +1000 commit: test +42530e986dbb65877ed8d61ca0c816e425e5c62e dc5bde4a09968b0819f34d193f6780df295d71cf CI 1648348101 +1100 commit: test diff --git a/test/integration/submoduleAdd/expected/.git_keep/logs/refs/heads/master b/test/integration/submoduleAdd/expected/repo/.git_keep/logs/refs/heads/master similarity index 68% rename from test/integration/submoduleAdd/expected/.git_keep/logs/refs/heads/master rename to test/integration/submoduleAdd/expected/repo/.git_keep/logs/refs/heads/master index df53976dc..58db0ace2 100644 --- a/test/integration/submoduleAdd/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ 0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI 1534792759 +0100 commit (initial): myfile1 a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 -42530e986dbb65877ed8d61ca0c816e425e5c62e 6de70e35394a99cc437d1bc70b0852b70c5bb03d CI 1617797593 +1000 commit: test +42530e986dbb65877ed8d61ca0c816e425e5c62e dc5bde4a09968b0819f34d193f6780df295d71cf CI 1648348101 +1100 commit: test diff --git a/test/integration/submoduleRemove/expected/.git_keep/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/HEAD similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/HEAD rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/HEAD diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/config b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/config similarity index 85% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/config rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/config index 91988eba6..39065f535 100644 --- a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/config +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/config @@ -7,7 +7,7 @@ precomposeunicode = true worktree = ../../../haha [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/other_repo + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/submoduleRemove/expected/.git_keep/description b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/description similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/description rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/description diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/index b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/index new file mode 100644 index 000000000..27523e56e Binary files /dev/null and b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/index differ diff --git a/test/integration/submoduleRemove/expected/.git_keep/info/exclude b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/info/exclude similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/info/exclude rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/info/exclude diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/HEAD new file mode 100644 index 000000000..502ae05d9 --- /dev/null +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348097 +1100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/heads/master b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/heads/master new file mode 100644 index 000000000..502ae05d9 --- /dev/null +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348097 +1100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD new file mode 100644 index 000000000..502ae05d9 --- /dev/null +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348097 +1100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/packed-refs b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/packed-refs similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/packed-refs rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/packed-refs diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/refs/heads/master b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/heads/master similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/refs/heads/master rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/heads/master diff --git a/test/integration/submoduleAdd/expected/.git_keep/modules/blah/refs/remotes/origin/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/remotes/origin/HEAD similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/modules/blah/refs/remotes/origin/HEAD rename to test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/remotes/origin/HEAD diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/5f/77fb3622a1035782a7dacc0cca12e674066b9e b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/5f/77fb3622a1035782a7dacc0cca12e674066b9e similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/5f/77fb3622a1035782a7dacc0cca12e674066b9e rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/5f/77fb3622a1035782a7dacc0cca12e674066b9e diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/submoduleAdd/expected/.git_keep/objects/b9/7660affc790464b00ad45c7186a882238d77fb b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/b9/7660affc790464b00ad45c7186a882238d77fb similarity index 100% rename from test/integration/submoduleAdd/expected/.git_keep/objects/b9/7660affc790464b00ad45c7186a882238d77fb rename to test/integration/submoduleAdd/expected/repo/.git_keep/objects/b9/7660affc790464b00ad45c7186a882238d77fb diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/dc/5bde4a09968b0819f34d193f6780df295d71cf b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/dc/5bde4a09968b0819f34d193f6780df295d71cf new file mode 100644 index 000000000..dabb1ddd8 Binary files /dev/null and b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/dc/5bde4a09968b0819f34d193f6780df295d71cf differ diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/refs/heads/master b/test/integration/submoduleAdd/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..d13f91cc3 --- /dev/null +++ b/test/integration/submoduleAdd/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +dc5bde4a09968b0819f34d193f6780df295d71cf diff --git a/test/integration/submoduleAdd/expected/.gitmodules_keep b/test/integration/submoduleAdd/expected/repo/.gitmodules_keep similarity index 100% rename from test/integration/submoduleAdd/expected/.gitmodules_keep rename to test/integration/submoduleAdd/expected/repo/.gitmodules_keep diff --git a/test/integration/submoduleAdd/expected/haha/.git_keep b/test/integration/submoduleAdd/expected/repo/haha/.git_keep similarity index 100% rename from test/integration/submoduleAdd/expected/haha/.git_keep rename to test/integration/submoduleAdd/expected/repo/haha/.git_keep diff --git a/test/integration/submoduleAdd/expected/myfile1 b/test/integration/submoduleAdd/expected/repo/haha/myfile1 similarity index 100% rename from test/integration/submoduleAdd/expected/myfile1 rename to test/integration/submoduleAdd/expected/repo/haha/myfile1 diff --git a/test/integration/submoduleAdd/expected/myfile2 b/test/integration/submoduleAdd/expected/repo/haha/myfile2 similarity index 100% rename from test/integration/submoduleAdd/expected/myfile2 rename to test/integration/submoduleAdd/expected/repo/haha/myfile2 diff --git a/test/integration/submoduleEnter/expected/myfile1 b/test/integration/submoduleAdd/expected/repo/myfile1 similarity index 100% rename from test/integration/submoduleEnter/expected/myfile1 rename to test/integration/submoduleAdd/expected/repo/myfile1 diff --git a/test/integration/submoduleEnter/expected/myfile2 b/test/integration/submoduleAdd/expected/repo/myfile2 similarity index 100% rename from test/integration/submoduleEnter/expected/myfile2 rename to test/integration/submoduleAdd/expected/repo/myfile2 diff --git a/test/integration/submoduleAdd/setup.sh b/test/integration/submoduleAdd/setup.sh index b5dc60ab7..47c92bd27 100644 --- a/test/integration/submoduleAdd/setup.sh +++ b/test/integration/submoduleAdd/setup.sh @@ -20,5 +20,5 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual other_repo -cd actual +git clone --bare ./repo other_repo +cd repo diff --git a/test/integration/submoduleEnter/expected/.git_keep/index b/test/integration/submoduleEnter/expected/.git_keep/index deleted file mode 100644 index 588f51460..000000000 Binary files a/test/integration/submoduleEnter/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/index b/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/index deleted file mode 100644 index 385fd7bf9..000000000 Binary files a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/index and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/HEAD b/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/HEAD deleted file mode 100644 index 149d30cef..000000000 --- a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/other_repo -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1643370757 +1100 rebase -i (start): checkout 42530e986dbb65877ed8d61ca0c816e425e5c62e -42530e986dbb65877ed8d61ca0c816e425e5c62e 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1643370757 +1100 rebase -i (finish): returning to refs/heads/master -42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1643370757 +1100 rebase -i (start): checkout a50a5125768001a3ea263ffb7cafbc421a508153 -a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1643370757 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/c8/3cc777cf98a8c0f3c0995d7c1b21db92a71c66 b/test/integration/submoduleEnter/expected/.git_keep/objects/c8/3cc777cf98a8c0f3c0995d7c1b21db92a71c66 deleted file mode 100644 index 7da492489..000000000 --- a/test/integration/submoduleEnter/expected/.git_keep/objects/c8/3cc777cf98a8c0f3c0995d7c1b21db92a71c66 +++ /dev/null @@ -1,2 +0,0 @@ -xÎK -Â0FaÇYEæ‚ÜÛäæ"‚£.#?([j—o—àôð NYz Í‘c4“oÖˆ>DÉ`r¡›ÉÕ&RŒHŠuŠ™Õš6¼†#[…Z‹!Zª)°riMj©ÎJJŸq_6}›õù6_ñM}}âT–~Ñì¬1ž¼›ô‘™HíuŸø“«÷P?"Û9¾ \ No newline at end of file diff --git a/test/integration/submoduleEnter/expected/.git_keep/refs/heads/master b/test/integration/submoduleEnter/expected/.git_keep/refs/heads/master deleted file mode 100644 index d109221f5..000000000 --- a/test/integration/submoduleEnter/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -c83cc777cf98a8c0f3c0995d7c1b21db92a71c66 diff --git a/test/integration/submoduleReset/expected/.git_keep/HEAD b/test/integration/submoduleEnter/expected/other_repo/HEAD similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/HEAD rename to test/integration/submoduleEnter/expected/other_repo/HEAD diff --git a/test/integration/submoduleEnter/expected/other_repo/config b/test/integration/submoduleEnter/expected/other_repo/config new file mode 100644 index 000000000..f3148fc2f --- /dev/null +++ b/test/integration/submoduleEnter/expected/other_repo/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/./repo diff --git a/test/integration/submoduleReset/expected/.git_keep/description b/test/integration/submoduleEnter/expected/other_repo/description similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/description rename to test/integration/submoduleEnter/expected/other_repo/description diff --git a/test/integration/submoduleReset/expected/.git_keep/info/exclude b/test/integration/submoduleEnter/expected/other_repo/info/exclude similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/info/exclude rename to test/integration/submoduleEnter/expected/other_repo/info/exclude diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleEnter/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/submoduleEnter/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleEnter/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleEnter/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleEnter/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e rename to test/integration/submoduleEnter/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c b/test/integration/submoduleEnter/expected/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c rename to test/integration/submoduleEnter/expected/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleEnter/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 rename to test/integration/submoduleEnter/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleEnter/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleEnter/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleEnter/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/submoduleEnter/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 b/test/integration/submoduleEnter/expected/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 rename to test/integration/submoduleEnter/expected/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 diff --git a/test/integration/submoduleEnter/expected/other_repo/packed-refs b/test/integration/submoduleEnter/expected/other_repo/packed-refs new file mode 100644 index 000000000..83e031563 --- /dev/null +++ b/test/integration/submoduleEnter/expected/other_repo/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 refs/heads/master diff --git a/test/integration/submoduleEnter/expected/.git_keep/COMMIT_EDITMSG b/test/integration/submoduleEnter/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/submoduleEnter/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/submoduleEnter/expected/.git_keep/FETCH_HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/FETCH_HEAD rename to test/integration/submoduleEnter/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/tags/expected/.git_keep/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/tags/expected/.git_keep/HEAD rename to test/integration/submoduleEnter/expected/repo/.git_keep/HEAD diff --git a/test/integration/submoduleEnter/expected/.git_keep/config b/test/integration/submoduleEnter/expected/repo/.git_keep/config similarity index 82% rename from test/integration/submoduleEnter/expected/.git_keep/config rename to test/integration/submoduleEnter/expected/repo/.git_keep/config index 6806f15bd..053d8f942 100644 --- a/test/integration/submoduleEnter/expected/.git_keep/config +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/config @@ -9,5 +9,5 @@ email = CI@example.com name = CI [submodule "other_repo"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/other_repo + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo active = true diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/description b/test/integration/submoduleEnter/expected/repo/.git_keep/description similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/description rename to test/integration/submoduleEnter/expected/repo/.git_keep/description diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/index b/test/integration/submoduleEnter/expected/repo/.git_keep/index new file mode 100644 index 000000000..0b75986af Binary files /dev/null and b/test/integration/submoduleEnter/expected/repo/.git_keep/index differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/info/exclude b/test/integration/submoduleEnter/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/info/exclude rename to test/integration/submoduleEnter/expected/repo/.git_keep/info/exclude diff --git a/test/integration/submoduleEnter/expected/.git_keep/logs/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/logs/HEAD similarity index 81% rename from test/integration/submoduleEnter/expected/.git_keep/logs/HEAD rename to test/integration/submoduleEnter/expected/repo/.git_keep/logs/HEAD index 123fc35c9..bcb2bf2e8 100644 --- a/test/integration/submoduleEnter/expected/.git_keep/logs/HEAD +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/logs/HEAD @@ -2,4 +2,4 @@ a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 42530e986dbb65877ed8d61ca0c816e425e5c62e fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 CI 1534792759 +0100 commit: myfile3 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 e1eb418c0ff98940d4ea817eebcff5dcdde645ce CI 1534792759 +0100 commit: add submodule -e1eb418c0ff98940d4ea817eebcff5dcdde645ce c83cc777cf98a8c0f3c0995d7c1b21db92a71c66 CI 1643370762 +1100 commit: test +e1eb418c0ff98940d4ea817eebcff5dcdde645ce fd65a5c96edfc884a78bfe3d0240cb8a7ea0a31a CI 1648348036 +1100 commit: test diff --git a/test/integration/submoduleEnter/expected/.git_keep/logs/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/logs/refs/heads/master similarity index 81% rename from test/integration/submoduleEnter/expected/.git_keep/logs/refs/heads/master rename to test/integration/submoduleEnter/expected/repo/.git_keep/logs/refs/heads/master index 123fc35c9..bcb2bf2e8 100644 --- a/test/integration/submoduleEnter/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/logs/refs/heads/master @@ -2,4 +2,4 @@ a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 42530e986dbb65877ed8d61ca0c816e425e5c62e fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 CI 1534792759 +0100 commit: myfile3 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 e1eb418c0ff98940d4ea817eebcff5dcdde645ce CI 1534792759 +0100 commit: add submodule -e1eb418c0ff98940d4ea817eebcff5dcdde645ce c83cc777cf98a8c0f3c0995d7c1b21db92a71c66 CI 1643370762 +1100 commit: test +e1eb418c0ff98940d4ea817eebcff5dcdde645ce fd65a5c96edfc884a78bfe3d0240cb8a7ea0a31a CI 1648348036 +1100 commit: test diff --git a/test/integration/tags4/expected/.git_keep/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/HEAD similarity index 100% rename from test/integration/tags4/expected/.git_keep/HEAD rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/HEAD diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/ORIG_HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/ORIG_HEAD rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/config b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/config similarity index 85% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/config rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/config index 153285317..d14d72ba1 100644 --- a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/config +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/config @@ -7,7 +7,7 @@ precomposeunicode = true worktree = ../../../other_repo [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/other_repo + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/description b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/description similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/description rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/description diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/index b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/index new file mode 100644 index 000000000..304e77844 Binary files /dev/null and b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/index differ diff --git a/test/integration/tags/expected/.git_keep/info/exclude b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/info/exclude similarity index 100% rename from test/integration/tags/expected/.git_keep/info/exclude rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/info/exclude diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/HEAD new file mode 100644 index 000000000..ed71cbd0f --- /dev/null +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo +fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348031 +1100 rebase -i (start): checkout 42530e986dbb65877ed8d61ca0c816e425e5c62e +42530e986dbb65877ed8d61ca0c816e425e5c62e 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348031 +1100 rebase -i (finish): returning to refs/heads/master +42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348032 +1100 rebase -i (start): checkout a50a5125768001a3ea263ffb7cafbc421a508153 +a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348032 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master similarity index 53% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/refs/heads/master rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master index b88258014..36662576a 100644 --- a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/refs/heads/master +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/other_repo -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1643370757 +1100 rebase -i (finish): refs/heads/master onto 42530e986dbb65877ed8d61ca0c816e425e5c62e -42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1643370757 +1100 rebase -i (finish): refs/heads/master onto a50a5125768001a3ea263ffb7cafbc421a508153 +0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo +fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348031 +1100 rebase -i (finish): refs/heads/master onto 42530e986dbb65877ed8d61ca0c816e425e5c62e +42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348032 +1100 rebase -i (finish): refs/heads/master onto a50a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD similarity index 70% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD index d08b838c1..259f2e9f2 100644 --- a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD @@ -1 +1 @@ -0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/other_repo +0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/packed-refs b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/packed-refs similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/packed-refs rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/packed-refs diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/heads/master similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/refs/heads/master rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/heads/master diff --git a/test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/refs/remotes/origin/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/modules/other_repo/refs/remotes/origin/HEAD rename to test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/10/7f435787895be1068f01326df55c355a9d29b1 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/10/7f435787895be1068f01326df55c355a9d29b1 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/10/7f435787895be1068f01326df55c355a9d29b1 rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/10/7f435787895be1068f01326df55c355a9d29b1 diff --git a/test/integration/tags2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/59/a9aee220657762e2d1c60799a0f5b03137d906 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/59/a9aee220657762e2d1c60799a0f5b03137d906 similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/59/a9aee220657762e2d1c60799a0f5b03137d906 rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/59/a9aee220657762e2d1c60799a0f5b03137d906 diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c new file mode 100644 index 000000000..56590efa1 Binary files /dev/null and b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/tags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/tags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/submoduleEnter/expected/.git_keep/objects/e1/eb418c0ff98940d4ea817eebcff5dcdde645ce b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/e1/eb418c0ff98940d4ea817eebcff5dcdde645ce similarity index 100% rename from test/integration/submoduleEnter/expected/.git_keep/objects/e1/eb418c0ff98940d4ea817eebcff5dcdde645ce rename to test/integration/submoduleEnter/expected/repo/.git_keep/objects/e1/eb418c0ff98940d4ea817eebcff5dcdde645ce diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 new file mode 100644 index 000000000..95d1a3bc9 --- /dev/null +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 @@ -0,0 +1,2 @@ +xŽK +Â0@]çÙ ’ßL&PDèªÇH&S,4¶”z{{·ï½Åã­µ¥k›Â¥":!Ñì(g†LR*oÀ!¦(ä$`ñ– «=òê:8ðFa-b”J-gÃdQN-ÀèDåwn‡'=ŒÓC>¹í«ÜxkwmÁ‡˜\„¤¯Æ£NzNuù3Wí;/«xõ•¶9ç \ No newline at end of file diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fd/65a5c96edfc884a78bfe3d0240cb8a7ea0a31a b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fd/65a5c96edfc884a78bfe3d0240cb8a7ea0a31a new file mode 100644 index 000000000..f431c893b --- /dev/null +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fd/65a5c96edfc884a78bfe3d0240cb8a7ea0a31a @@ -0,0 +1,4 @@ +xÎM +1 @a×=E÷‚$Ó¦MADp5ÇèOŠ‚u†1‚ÇwŽàöñ-^]Æx¨Å„ÝD,BìÞQäȉŠ î€n +­UG”S›RA³æM^j¥xä +½'Nš—ÌEJíZmM‚§*&ô¾lö6Ûóm¾Ê7õ)§ºŒ‹ÅàÙyìÀìuŸRù“•·š$99Æ \ No newline at end of file diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..35e1a490a --- /dev/null +++ b/test/integration/submoduleEnter/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +fd65a5c96edfc884a78bfe3d0240cb8a7ea0a31a diff --git a/test/integration/submoduleEnter/expected/.gitmodules_keep b/test/integration/submoduleEnter/expected/repo/.gitmodules_keep similarity index 100% rename from test/integration/submoduleEnter/expected/.gitmodules_keep rename to test/integration/submoduleEnter/expected/repo/.gitmodules_keep diff --git a/test/integration/submoduleEnter/expected/other_repo/myfile1 b/test/integration/submoduleEnter/expected/repo/myfile1 similarity index 100% rename from test/integration/submoduleEnter/expected/other_repo/myfile1 rename to test/integration/submoduleEnter/expected/repo/myfile1 diff --git a/test/integration/submoduleRemove/expected/myfile2 b/test/integration/submoduleEnter/expected/repo/myfile2 similarity index 100% rename from test/integration/submoduleRemove/expected/myfile2 rename to test/integration/submoduleEnter/expected/repo/myfile2 diff --git a/test/integration/submoduleEnter/expected/myfile3 b/test/integration/submoduleEnter/expected/repo/myfile3 similarity index 100% rename from test/integration/submoduleEnter/expected/myfile3 rename to test/integration/submoduleEnter/expected/repo/myfile3 diff --git a/test/integration/submoduleEnter/expected/other_repo/.git_keep b/test/integration/submoduleEnter/expected/repo/other_repo/.git_keep similarity index 100% rename from test/integration/submoduleEnter/expected/other_repo/.git_keep rename to test/integration/submoduleEnter/expected/repo/other_repo/.git_keep diff --git a/test/integration/submoduleRemove/expected/myfile1 b/test/integration/submoduleEnter/expected/repo/other_repo/myfile1 similarity index 100% rename from test/integration/submoduleRemove/expected/myfile1 rename to test/integration/submoduleEnter/expected/repo/other_repo/myfile1 diff --git a/test/integration/submoduleEnter/setup.sh b/test/integration/submoduleEnter/setup.sh index 2f876d8ae..307593a71 100644 --- a/test/integration/submoduleEnter/setup.sh +++ b/test/integration/submoduleEnter/setup.sh @@ -23,8 +23,8 @@ git add . git commit -am "myfile3" cd .. -git clone --bare ./actual other_repo -cd actual +git clone --bare ./repo other_repo +cd repo git submodule add ../other_repo git commit -am "add submodule" diff --git a/test/integration/submoduleRemove/expected/.git_keep/index b/test/integration/submoduleRemove/expected/.git_keep/index deleted file mode 100644 index 5a4c6431f..000000000 Binary files a/test/integration/submoduleRemove/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/40/f121d7563ed318d461996b8d84e2ec8632687e b/test/integration/submoduleRemove/expected/.git_keep/objects/40/f121d7563ed318d461996b8d84e2ec8632687e deleted file mode 100644 index 3fed8203a..000000000 --- a/test/integration/submoduleRemove/expected/.git_keep/objects/40/f121d7563ed318d461996b8d84e2ec8632687e +++ /dev/null @@ -1,2 +0,0 @@ -xŽK -Â0@]çÙ 2“¯‚ˆÐU1“LPhL‰©x|{—ïñ/µZŸC°‡ÑEtAgÁYfo#ûh"íRaF:g,žŒ1Y­Ôå5ô%#' ƒÂ&•ÌÁ@(.:É>–ìSöè(ÚÆ£u=Íú:ÍwùR]9¥Voƒ³6BŒVÔn÷©!æªKmÑïkËÛ"ê!‘>] \ No newline at end of file diff --git a/test/integration/submoduleRemove/expected/.git_keep/refs/heads/master b/test/integration/submoduleRemove/expected/.git_keep/refs/heads/master deleted file mode 100644 index 0c4653c44..000000000 --- a/test/integration/submoduleRemove/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -40f121d7563ed318d461996b8d84e2ec8632687e diff --git a/test/integration/undo2/expected/.git_keep/HEAD b/test/integration/submoduleRemove/expected/other_repo/HEAD similarity index 100% rename from test/integration/undo2/expected/.git_keep/HEAD rename to test/integration/submoduleRemove/expected/other_repo/HEAD diff --git a/test/integration/submoduleRemove/expected/other_repo/config b/test/integration/submoduleRemove/expected/other_repo/config new file mode 100644 index 000000000..e710ce53e --- /dev/null +++ b/test/integration/submoduleRemove/expected/other_repo/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleRemove/actual/./repo diff --git a/test/integration/tags/expected/.git_keep/description b/test/integration/submoduleRemove/expected/other_repo/description similarity index 100% rename from test/integration/tags/expected/.git_keep/description rename to test/integration/submoduleRemove/expected/other_repo/description diff --git a/test/integration/tags2/expected/.git_keep/info/exclude b/test/integration/submoduleRemove/expected/other_repo/info/exclude similarity index 100% rename from test/integration/tags2/expected/.git_keep/info/exclude rename to test/integration/submoduleRemove/expected/other_repo/info/exclude diff --git a/test/integration/submoduleRemove/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleRemove/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/submoduleRemove/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/tags3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleRemove/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleRemove/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleRemove/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e rename to test/integration/submoduleRemove/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleRemove/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 rename to test/integration/submoduleRemove/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/tags2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleRemove/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleRemove/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleRemove/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleRemove/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/submoduleRemove/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/submoduleRemove/expected/other_repo/packed-refs b/test/integration/submoduleRemove/expected/other_repo/packed-refs new file mode 100644 index 000000000..62f6568b2 --- /dev/null +++ b/test/integration/submoduleRemove/expected/other_repo/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +42530e986dbb65877ed8d61ca0c816e425e5c62e refs/heads/master diff --git a/test/integration/submoduleRemove/expected/.git_keep/COMMIT_EDITMSG b/test/integration/submoduleRemove/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/submoduleRemove/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/submoduleRemove/expected/.git_keep/FETCH_HEAD b/test/integration/submoduleRemove/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/FETCH_HEAD rename to test/integration/submoduleRemove/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/HEAD b/test/integration/submoduleRemove/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/submoduleRemove/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/submoduleRemove/expected/.git_keep/config b/test/integration/submoduleRemove/expected/repo/.git_keep/config similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/config rename to test/integration/submoduleRemove/expected/repo/.git_keep/config diff --git a/test/integration/tags2/expected/.git_keep/description b/test/integration/submoduleRemove/expected/repo/.git_keep/description similarity index 100% rename from test/integration/tags2/expected/.git_keep/description rename to test/integration/submoduleRemove/expected/repo/.git_keep/description diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/index b/test/integration/submoduleRemove/expected/repo/.git_keep/index new file mode 100644 index 000000000..93d0089f1 Binary files /dev/null and b/test/integration/submoduleRemove/expected/repo/.git_keep/index differ diff --git a/test/integration/tags3/expected/.git_keep/info/exclude b/test/integration/submoduleRemove/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/tags3/expected/.git_keep/info/exclude rename to test/integration/submoduleRemove/expected/repo/.git_keep/info/exclude diff --git a/test/integration/submoduleRemove/expected/.git_keep/logs/HEAD b/test/integration/submoduleRemove/expected/repo/.git_keep/logs/HEAD similarity index 77% rename from test/integration/submoduleRemove/expected/.git_keep/logs/HEAD rename to test/integration/submoduleRemove/expected/repo/.git_keep/logs/HEAD index a38da0237..34e702d94 100644 --- a/test/integration/submoduleRemove/expected/.git_keep/logs/HEAD +++ b/test/integration/submoduleRemove/expected/repo/.git_keep/logs/HEAD @@ -1,4 +1,4 @@ 0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI 1534792759 +0100 commit (initial): myfile1 a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 42530e986dbb65877ed8d61ca0c816e425e5c62e 9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 CI 1534792759 +0100 commit: add submodule -9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 40f121d7563ed318d461996b8d84e2ec8632687e CI 1643370773 +1100 commit: remove submodule +9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 611cac756ef1944ab56d12f4ea3ae4623724c8cf CI 1648348134 +1100 commit: remove submodule diff --git a/test/integration/submoduleRemove/expected/.git_keep/logs/refs/heads/master b/test/integration/submoduleRemove/expected/repo/.git_keep/logs/refs/heads/master similarity index 77% rename from test/integration/submoduleRemove/expected/.git_keep/logs/refs/heads/master rename to test/integration/submoduleRemove/expected/repo/.git_keep/logs/refs/heads/master index a38da0237..34e702d94 100644 --- a/test/integration/submoduleRemove/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/submoduleRemove/expected/repo/.git_keep/logs/refs/heads/master @@ -1,4 +1,4 @@ 0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI 1534792759 +0100 commit (initial): myfile1 a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 42530e986dbb65877ed8d61ca0c816e425e5c62e 9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 CI 1534792759 +0100 commit: add submodule -9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 40f121d7563ed318d461996b8d84e2ec8632687e CI 1643370773 +1100 commit: remove submodule +9d10a5a0a21eb2cfdb6206f474ed57fd5cd51440 611cac756ef1944ab56d12f4ea3ae4623724c8cf CI 1648348134 +1100 commit: remove submodule diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleRemove/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff rename to test/integration/submoduleRemove/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 rename to test/integration/submoduleRemove/expected/repo/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e new file mode 100644 index 000000000..64d20cb1e Binary files /dev/null and b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e differ diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/objects/61/1cac756ef1944ab56d12f4ea3ae4623724c8cf b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/61/1cac756ef1944ab56d12f4ea3ae4623724c8cf new file mode 100644 index 000000000..6c2492dc7 Binary files /dev/null and b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/61/1cac756ef1944ab56d12f4ea3ae4623724c8cf differ diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 rename to test/integration/submoduleRemove/expected/repo/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 new file mode 100644 index 000000000..5dd5f3236 --- /dev/null +++ b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 @@ -0,0 +1,2 @@ +xÍM +ƒ0@á®sŠÙJ&Nþ Á•Ç“  I¡Þ¾¡ÛÇ/µZ×HîÖÐâRÑì%d"Áàr@ÃX<-4dG…“5Š?ýݘfxNó(_®û&Ôê Ðä£ñ6Â]£Öêª×¤ËŸ\Õ³¬› ú5,ß \ No newline at end of file diff --git a/test/integration/tags3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleRemove/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 rename to test/integration/submoduleRemove/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/integration/submoduleRemove/expected/.git_keep/objects/f1/43043bb53b17b5727a43b6cfbb1a8d1f5a222d b/test/integration/submoduleRemove/expected/repo/.git_keep/objects/f1/43043bb53b17b5727a43b6cfbb1a8d1f5a222d similarity index 100% rename from test/integration/submoduleRemove/expected/.git_keep/objects/f1/43043bb53b17b5727a43b6cfbb1a8d1f5a222d rename to test/integration/submoduleRemove/expected/repo/.git_keep/objects/f1/43043bb53b17b5727a43b6cfbb1a8d1f5a222d diff --git a/test/integration/submoduleRemove/expected/repo/.git_keep/refs/heads/master b/test/integration/submoduleRemove/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..6c6578e0b --- /dev/null +++ b/test/integration/submoduleRemove/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +611cac756ef1944ab56d12f4ea3ae4623724c8cf diff --git a/test/integration/submoduleRemove/expected/.gitmodules_keep b/test/integration/submoduleRemove/expected/repo/.gitmodules_keep similarity index 100% rename from test/integration/submoduleRemove/expected/.gitmodules_keep rename to test/integration/submoduleRemove/expected/repo/.gitmodules_keep diff --git a/test/integration/submoduleReset/expected/myfile1 b/test/integration/submoduleRemove/expected/repo/myfile1 similarity index 100% rename from test/integration/submoduleReset/expected/myfile1 rename to test/integration/submoduleRemove/expected/repo/myfile1 diff --git a/test/integration/submoduleReset/expected/myfile2 b/test/integration/submoduleRemove/expected/repo/myfile2 similarity index 100% rename from test/integration/submoduleReset/expected/myfile2 rename to test/integration/submoduleRemove/expected/repo/myfile2 diff --git a/test/integration/submoduleRemove/setup.sh b/test/integration/submoduleRemove/setup.sh index 250092ed1..2525abf31 100644 --- a/test/integration/submoduleRemove/setup.sh +++ b/test/integration/submoduleRemove/setup.sh @@ -20,8 +20,8 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual other_repo -cd actual +git clone --bare ./repo other_repo +cd repo git submodule add ../other_repo git commit -am "add submodule" diff --git a/test/integration/submoduleReset/expected/.git_keep/index b/test/integration/submoduleReset/expected/.git_keep/index deleted file mode 100644 index 8997e61f4..000000000 Binary files a/test/integration/submoduleReset/expected/.git_keep/index and /dev/null differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/index b/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/index deleted file mode 100644 index 407447e94..000000000 Binary files a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/index and /dev/null differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/HEAD b/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/HEAD deleted file mode 100644 index 2d343313b..000000000 --- a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/other_repo -42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1643370783 +1100 rebase -i (start): checkout a50a5125768001a3ea263ffb7cafbc421a508153 -a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1643370783 +1100 rebase -i (finish): returning to refs/heads/master -a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1643370791 +1100 reset: moving to HEAD -a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1643370791 +1100 checkout: moving from master to 42530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/stash b/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/stash deleted file mode 100644 index 4d43eb072..000000000 --- a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f35aba17e85e3fe18f7b01c0f65306c9289c482e Jesse Duffield 1643370791 +1100 WIP on master: a50a512 myfile1 diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/84/69b6d9b0a33be075f9e0df61c5a3ebba3ecfd2 b/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/84/69b6d9b0a33be075f9e0df61c5a3ebba3ecfd2 deleted file mode 100644 index 50202f0c4..000000000 --- a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/84/69b6d9b0a33be075f9e0df61c5a3ebba3ecfd2 +++ /dev/null @@ -1,2 +0,0 @@ -x¥K E³Š771 -ÆŽÜŸ‡¢¥$…ܽmâžs“sC-%wBíúLÒ¡bÐR¯É[‡IIŸLÔV“<‘´(™[ú³Îp§ÖnKJ™Æç×Æ1þøú(.‡P˸–ÃpÄ£å°ç‘­v½îôW„-SŸ]xS„”GjP'(®­Õ8…Nqå³Mœ}„óJ³ \ No newline at end of file diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/9d/13001fc1d98cd178f9e604f6f2c2e52794079e b/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/9d/13001fc1d98cd178f9e604f6f2c2e52794079e deleted file mode 100644 index 8700d75ac..000000000 Binary files a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/9d/13001fc1d98cd178f9e604f6f2c2e52794079e and /dev/null differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/f3/5aba17e85e3fe18f7b01c0f65306c9289c482e b/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/f3/5aba17e85e3fe18f7b01c0f65306c9289c482e deleted file mode 100644 index e48c17184..000000000 Binary files a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/f3/5aba17e85e3fe18f7b01c0f65306c9289c482e and /dev/null differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/refs/stash b/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/refs/stash deleted file mode 100644 index 4a83bf1dd..000000000 --- a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/refs/stash +++ /dev/null @@ -1 +0,0 @@ -f35aba17e85e3fe18f7b01c0f65306c9289c482e diff --git a/test/integration/submoduleReset/expected/other_repo/HEAD b/test/integration/submoduleReset/expected/other_repo/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/submoduleReset/expected/other_repo/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/submoduleReset/expected/other_repo/config b/test/integration/submoduleReset/expected/other_repo/config new file mode 100644 index 000000000..662e16b6c --- /dev/null +++ b/test/integration/submoduleReset/expected/other_repo/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/./repo diff --git a/test/integration/tags3/expected/.git_keep/description b/test/integration/submoduleReset/expected/other_repo/description similarity index 100% rename from test/integration/tags3/expected/.git_keep/description rename to test/integration/submoduleReset/expected/other_repo/description diff --git a/test/integration/undo/expected/.git_keep/info/exclude b/test/integration/submoduleReset/expected/other_repo/info/exclude similarity index 100% rename from test/integration/undo/expected/.git_keep/info/exclude rename to test/integration/submoduleReset/expected/other_repo/info/exclude diff --git a/test/integration/submoduleReset/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleReset/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/submoduleReset/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleReset/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/submoduleReset/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/submoduleReset/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleReset/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e new file mode 100644 index 000000000..64d20cb1e Binary files /dev/null and b/test/integration/submoduleReset/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e differ diff --git a/test/integration/submoduleReset/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleReset/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 new file mode 100644 index 000000000..5dd5f3236 --- /dev/null +++ b/test/integration/submoduleReset/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 @@ -0,0 +1,2 @@ +xÍM +ƒ0@á®sŠÙJ&Nþ Á•Ç“  I¡Þ¾¡ÛÇ/µZ×HîÖÐâRÑì%d"Áàr@ÃX<-4dG…“5Š?ýݘfxNó(_®û&Ôê Ðä£ñ6Â]£Öêª×¤ËŸ\Õ³¬› ú5,ß \ No newline at end of file diff --git a/test/integration/tags4/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleReset/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleReset/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleReset/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleReset/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/submoduleReset/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/submoduleReset/expected/other_repo/packed-refs b/test/integration/submoduleReset/expected/other_repo/packed-refs new file mode 100644 index 000000000..62f6568b2 --- /dev/null +++ b/test/integration/submoduleReset/expected/other_repo/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +42530e986dbb65877ed8d61ca0c816e425e5c62e refs/heads/master diff --git a/test/integration/submoduleReset/expected/.git_keep/COMMIT_EDITMSG b/test/integration/submoduleReset/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/submoduleReset/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/submoduleReset/expected/.git_keep/FETCH_HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/FETCH_HEAD rename to test/integration/submoduleReset/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/submoduleReset/expected/.git_keep/config b/test/integration/submoduleReset/expected/repo/.git_keep/config similarity index 82% rename from test/integration/submoduleReset/expected/.git_keep/config rename to test/integration/submoduleReset/expected/repo/.git_keep/config index 30e8aeba3..ff4ef7e1c 100644 --- a/test/integration/submoduleReset/expected/.git_keep/config +++ b/test/integration/submoduleReset/expected/repo/.git_keep/config @@ -9,5 +9,5 @@ email = CI@example.com name = CI [submodule "other_repo"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/other_repo + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo active = true diff --git a/test/integration/tags4/expected/.git_keep/description b/test/integration/submoduleReset/expected/repo/.git_keep/description similarity index 100% rename from test/integration/tags4/expected/.git_keep/description rename to test/integration/submoduleReset/expected/repo/.git_keep/description diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/index b/test/integration/submoduleReset/expected/repo/.git_keep/index new file mode 100644 index 000000000..479039f96 Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/index differ diff --git a/test/integration/undo2/expected/.git_keep/info/exclude b/test/integration/submoduleReset/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/undo2/expected/.git_keep/info/exclude rename to test/integration/submoduleReset/expected/repo/.git_keep/info/exclude diff --git a/test/integration/submoduleReset/expected/.git_keep/logs/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/logs/HEAD rename to test/integration/submoduleReset/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/submoduleReset/expected/.git_keep/logs/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/logs/refs/heads/master rename to test/integration/submoduleReset/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/HEAD similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/HEAD rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/HEAD diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/ORIG_HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/ORIG_HEAD rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/config b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/config similarity index 85% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/config rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/config index 3ffcf6005..57da72856 100644 --- a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/config +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/config @@ -7,7 +7,7 @@ precomposeunicode = true worktree = ../../../other_repo [remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/other_repo + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin diff --git a/test/integration/undo/expected/.git_keep/description b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/description similarity index 100% rename from test/integration/undo/expected/.git_keep/description rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/description diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/index b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/index new file mode 100644 index 000000000..e02fb9711 Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/index differ diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/info/exclude b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/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/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/HEAD new file mode 100644 index 000000000..a5e1c88ec --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo +42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348154 +1100 rebase -i (start): checkout a50a5125768001a3ea263ffb7cafbc421a508153 +a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348154 +1100 rebase -i (finish): returning to refs/heads/master +a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348162 +1100 reset: moving to HEAD +a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348162 +1100 checkout: moving from master to 42530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master similarity index 58% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/heads/master rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master index 227bcfcb6..07a1588f3 100644 --- a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/heads/master +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/other_repo -42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1643370783 +1100 rebase -i (finish): refs/heads/master onto a50a5125768001a3ea263ffb7cafbc421a508153 +0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo +42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348154 +1100 rebase -i (finish): refs/heads/master onto a50a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD similarity index 70% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD index c0c3c89d8..ac58921d8 100644 --- a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD @@ -1 +1 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/other_repo +0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleReset/actual/other_repo diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/stash b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/stash new file mode 100644 index 000000000..455599518 --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 874e570cb4ea7387ba59054b315aa584038cacea Jesse Duffield 1648348162 +1100 WIP on master: a50a512 myfile1 diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/a177705e91137f8c55965c9c8818dd55e97c89 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/a177705e91137f8c55965c9c8818dd55e97c89 new file mode 100644 index 000000000..20341dac7 --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/a177705e91137f8c55965c9c8818dd55e97c89 @@ -0,0 +1,2 @@ +x¥A E]sŠÙ›ÀPcŒ WÞb€AÑR’BÞÞ6ñ.ßûÉû¡–’;hmv}fôN›,êà-û¤•lÐ'í Kž‰‚–þ¬3ܹ5†Û’Ræ1ÂùµqŒ?¾> +åñj¹€²èŽè”Õ°WJJ±Úõºó_±L}¦ðæ)Ü NP¨­Õ‘d”†òÙ&%¾†ƒJ· \ No newline at end of file diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/17/defcd0e1f9ad96542aa66845e53cb46c91c30d b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/defcd0e1f9ad96542aa66845e53cb46c91c30d similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/17/defcd0e1f9ad96542aa66845e53cb46c91c30d rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/17/defcd0e1f9ad96542aa66845e53cb46c91c30d diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e new file mode 100644 index 000000000..64d20cb1e Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/87/4e570cb4ea7387ba59054b315aa584038cacea b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/87/4e570cb4ea7387ba59054b315aa584038cacea new file mode 100644 index 000000000..27b770b53 --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/87/4e570cb4ea7387ba59054b315aa584038cacea @@ -0,0 +1,2 @@ +x¥1OÅ0 „™û+²#¡8‰!ÄÀ³c;¼¢öµ}ÿž ñ~ãÝ}:['ë²L‡‹˜oŽÍÌAQk¢Þ ¬cƘs¦„†QjÊ2‚D¯Ãov>£g„€%“÷ÀÑ8äØZ-­J +ÐŒW^CèA#%_«–TE©³F …}”Ö/`½òÝ…RŠGbi$ˆý+…H{P„Æ/ÇiÝÜ«í»¹çKk“Íê>µêŸ~úXxšïd]äD1äàn¼ºÛ§8ì_%ÃûË›[Ïná½7Ý_÷qËw›fƒ™WnÆ \ No newline at end of file diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 new file mode 100644 index 000000000..5dd5f3236 --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 @@ -0,0 +1,2 @@ +xÍM +ƒ0@á®sŠÙJ&Nþ Á•Ç“  I¡Þ¾¡ÛÇ/µZ×HîÖÐâRÑì%d"Áàr@ÃX<-4dG…“5Š?ýݘfxNó(_®û&Ôê Ðä£ñ6Â]£Öêª×¤ËŸ\Õ³¬› ú5,ß \ No newline at end of file diff --git a/test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/d2/2afbf8d80bbd74bcd87cae8a17a0315cfc915b b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/d2/2afbf8d80bbd74bcd87cae8a17a0315cfc915b new file mode 100644 index 000000000..7b37fd58d Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/objects/d2/2afbf8d80bbd74bcd87cae8a17a0315cfc915b differ diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/packed-refs b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/packed-refs similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/packed-refs rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/packed-refs diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/heads/master similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/refs/heads/master rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/heads/master diff --git a/test/integration/submoduleReset/expected/.git_keep/modules/other_repo/refs/remotes/origin/HEAD b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/modules/other_repo/refs/remotes/origin/HEAD rename to test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/stash b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/stash new file mode 100644 index 000000000..5d3437a08 --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/modules/other_repo/refs/stash @@ -0,0 +1 @@ +874e570cb4ea7387ba59054b315aa584038cacea diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 000000000..7f2ebf4ee Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 differ diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff b/test/integration/submoduleReset/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff rename to test/integration/submoduleReset/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 rename to test/integration/submoduleReset/expected/repo/.git_keep/objects/2e/eb2c1e6451d1318b506eecddf936b59a5f32b8 diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleReset/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e new file mode 100644 index 000000000..64d20cb1e Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e differ diff --git a/test/integration/submoduleReset/expected/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 rename to test/integration/submoduleReset/expected/repo/.git_keep/objects/9d/10a5a0a21eb2cfdb6206f474ed57fd5cd51440 diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 new file mode 100644 index 000000000..5dd5f3236 --- /dev/null +++ b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 @@ -0,0 +1,2 @@ +xÍM +ƒ0@á®sŠÙJ&Nþ Á•Ç“  I¡Þ¾¡ÛÇ/µZ×HîÖÐâRÑì%d"Áàr@ÃX<-4dG…“5Š?ýݘfxNó(_®û&Ôê Ðä£ñ6Â]£Öêª×¤ËŸ\Õ³¬› ú5,ß \ No newline at end of file diff --git a/test/integration/undo2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/submoduleReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/submoduleReset/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 000000000..96d2e71a6 Binary files /dev/null and b/test/integration/submoduleReset/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 differ diff --git a/test/integration/submoduleReset/expected/.git_keep/refs/heads/master b/test/integration/submoduleReset/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/submoduleReset/expected/.git_keep/refs/heads/master rename to test/integration/submoduleReset/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/submoduleReset/expected/.gitmodules_keep b/test/integration/submoduleReset/expected/repo/.gitmodules_keep similarity index 100% rename from test/integration/submoduleReset/expected/.gitmodules_keep rename to test/integration/submoduleReset/expected/repo/.gitmodules_keep diff --git a/test/integration/submoduleReset/expected/other_repo/myfile1 b/test/integration/submoduleReset/expected/repo/myfile1 similarity index 100% rename from test/integration/submoduleReset/expected/other_repo/myfile1 rename to test/integration/submoduleReset/expected/repo/myfile1 diff --git a/test/integration/submoduleReset/expected/other_repo/myfile2 b/test/integration/submoduleReset/expected/repo/myfile2 similarity index 100% rename from test/integration/submoduleReset/expected/other_repo/myfile2 rename to test/integration/submoduleReset/expected/repo/myfile2 diff --git a/test/integration/submoduleReset/expected/other_repo/.git_keep b/test/integration/submoduleReset/expected/repo/other_repo/.git_keep similarity index 100% rename from test/integration/submoduleReset/expected/other_repo/.git_keep rename to test/integration/submoduleReset/expected/repo/other_repo/.git_keep diff --git a/test/integration/tags/expected/file1 b/test/integration/submoduleReset/expected/repo/other_repo/myfile1 similarity index 100% rename from test/integration/tags/expected/file1 rename to test/integration/submoduleReset/expected/repo/other_repo/myfile1 diff --git a/test/integration/tags2/expected/file2 b/test/integration/submoduleReset/expected/repo/other_repo/myfile2 similarity index 100% rename from test/integration/tags2/expected/file2 rename to test/integration/submoduleReset/expected/repo/other_repo/myfile2 diff --git a/test/integration/submoduleReset/setup.sh b/test/integration/submoduleReset/setup.sh index 250092ed1..2525abf31 100644 --- a/test/integration/submoduleReset/setup.sh +++ b/test/integration/submoduleReset/setup.sh @@ -20,8 +20,8 @@ git add . git commit -am "myfile2" cd .. -git clone --bare ./actual other_repo -cd actual +git clone --bare ./repo other_repo +cd repo git submodule add ../other_repo git commit -am "add submodule" diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/COMMIT_EDITMSG b/test/integration/switchTabFromMenu/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/FETCH_HEAD b/test/integration/switchTabFromMenu/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/FETCH_HEAD rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/HEAD b/test/integration/switchTabFromMenu/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/HEAD rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/HEAD diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/config b/test/integration/switchTabFromMenu/expected/repo/.git_keep/config similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/config rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/config diff --git a/test/integration/undo2/expected/.git_keep/description b/test/integration/switchTabFromMenu/expected/repo/.git_keep/description similarity index 100% rename from test/integration/undo2/expected/.git_keep/description rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/description diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/index b/test/integration/switchTabFromMenu/expected/repo/.git_keep/index similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/index rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/index diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/info/exclude b/test/integration/switchTabFromMenu/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/info/exclude rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/info/exclude diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/logs/HEAD b/test/integration/switchTabFromMenu/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/logs/HEAD rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/logs/refs/heads/master b/test/integration/switchTabFromMenu/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/logs/refs/heads/master rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/objects/09/767bd3484e22b41138116992cc1cb5bc45fb7f b/test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/09/767bd3484e22b41138116992cc1cb5bc45fb7f similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/objects/09/767bd3484e22b41138116992cc1cb5bc45fb7f rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/09/767bd3484e22b41138116992cc1cb5bc45fb7f diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/objects/72/068e9a852a790a9b867e8b5d21cb4ede3ba4d7 b/test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/72/068e9a852a790a9b867e8b5d21cb4ede3ba4d7 similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/objects/72/068e9a852a790a9b867e8b5d21cb4ede3ba4d7 rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/72/068e9a852a790a9b867e8b5d21cb4ede3ba4d7 diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/objects/c4/534c51b41b7c85f4fad4657885792d95797e8c b/test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/c4/534c51b41b7c85f4fad4657885792d95797e8c similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/objects/c4/534c51b41b7c85f4fad4657885792d95797e8c rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/c4/534c51b41b7c85f4fad4657885792d95797e8c diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/objects/e0/aeb3ba0b32392aaf7d88a5190aca76be967225 b/test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/e0/aeb3ba0b32392aaf7d88a5190aca76be967225 similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/objects/e0/aeb3ba0b32392aaf7d88a5190aca76be967225 rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/e0/aeb3ba0b32392aaf7d88a5190aca76be967225 diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/refs/heads/master b/test/integration/switchTabFromMenu/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/refs/heads/master rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/refs/tags/0.0.1 b/test/integration/switchTabFromMenu/expected/repo/.git_keep/refs/tags/0.0.1 similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/refs/tags/0.0.1 rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/refs/tags/0.0.1 diff --git a/test/integration/switchTabFromMenu/expected/.git_keep/refs/tags/0.0.2 b/test/integration/switchTabFromMenu/expected/repo/.git_keep/refs/tags/0.0.2 similarity index 100% rename from test/integration/switchTabFromMenu/expected/.git_keep/refs/tags/0.0.2 rename to test/integration/switchTabFromMenu/expected/repo/.git_keep/refs/tags/0.0.2 diff --git a/test/integration/switchTabFromMenu/expected/file0 b/test/integration/switchTabFromMenu/expected/repo/file0 similarity index 100% rename from test/integration/switchTabFromMenu/expected/file0 rename to test/integration/switchTabFromMenu/expected/repo/file0 diff --git a/test/integration/switchTabFromMenu/expected/file1 b/test/integration/switchTabFromMenu/expected/repo/file1 similarity index 100% rename from test/integration/switchTabFromMenu/expected/file1 rename to test/integration/switchTabFromMenu/expected/repo/file1 diff --git a/test/integration/tags/expected/.git_keep/COMMIT_EDITMSG b/test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/tags/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/tags/expected/.git_keep/FETCH_HEAD b/test/integration/tags/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/tags/expected/.git_keep/FETCH_HEAD rename to test/integration/tags/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/tags/expected/repo/.git_keep/HEAD b/test/integration/tags/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/tags/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/tags/expected/.git_keep/config b/test/integration/tags/expected/repo/.git_keep/config similarity index 100% rename from test/integration/tags/expected/.git_keep/config rename to test/integration/tags/expected/repo/.git_keep/config diff --git a/test/integration/tags/expected/repo/.git_keep/description b/test/integration/tags/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/tags/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags/expected/.git_keep/index b/test/integration/tags/expected/repo/.git_keep/index similarity index 100% rename from test/integration/tags/expected/.git_keep/index rename to test/integration/tags/expected/repo/.git_keep/index diff --git a/test/integration/tags/expected/repo/.git_keep/info/exclude b/test/integration/tags/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/tags/expected/repo/.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/tags/expected/.git_keep/logs/HEAD b/test/integration/tags/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/tags/expected/.git_keep/logs/HEAD rename to test/integration/tags/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/tags/expected/.git_keep/logs/refs/heads/master b/test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/tags/expected/.git_keep/logs/refs/heads/master rename to test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/tags/expected/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 b/test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 similarity index 100% rename from test/integration/tags/expected/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 rename to test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 diff --git a/test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/tags/expected/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 b/test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 similarity index 100% rename from test/integration/tags/expected/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 rename to test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 diff --git a/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/tags/expected/.git_keep/packed-refs b/test/integration/tags/expected/repo/.git_keep/packed-refs similarity index 100% rename from test/integration/tags/expected/.git_keep/packed-refs rename to test/integration/tags/expected/repo/.git_keep/packed-refs diff --git a/test/integration/tags/expected/.git_keep/refs/heads/master b/test/integration/tags/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/tags/expected/.git_keep/refs/heads/master rename to test/integration/tags/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag1 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 similarity index 100% rename from test/integration/tags/expected/.git_keep/refs/tags/tag1 rename to test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag3 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 similarity index 100% rename from test/integration/tags/expected/.git_keep/refs/tags/tag3 rename to test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag4 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 similarity index 100% rename from test/integration/tags/expected/.git_keep/refs/tags/tag4 rename to test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 diff --git a/test/integration/tags/expected/file0 b/test/integration/tags/expected/repo/file0 similarity index 100% rename from test/integration/tags/expected/file0 rename to test/integration/tags/expected/repo/file0 diff --git a/test/integration/tags2/expected/file1 b/test/integration/tags/expected/repo/file1 similarity index 100% rename from test/integration/tags2/expected/file1 rename to test/integration/tags/expected/repo/file1 diff --git a/test/integration/tags2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/tags2/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/tags2/expected/.git_keep/FETCH_HEAD b/test/integration/tags2/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/tags2/expected/.git_keep/FETCH_HEAD rename to test/integration/tags2/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/tags2/expected/.git_keep/HEAD b/test/integration/tags2/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/tags2/expected/.git_keep/HEAD rename to test/integration/tags2/expected/repo/.git_keep/HEAD diff --git a/test/integration/tags2/expected/.git_keep/ORIG_HEAD b/test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/tags2/expected/.git_keep/ORIG_HEAD rename to test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/tags2/expected/.git_keep/config b/test/integration/tags2/expected/repo/.git_keep/config similarity index 100% rename from test/integration/tags2/expected/.git_keep/config rename to test/integration/tags2/expected/repo/.git_keep/config diff --git a/test/integration/tags2/expected/repo/.git_keep/description b/test/integration/tags2/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/tags2/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags2/expected/.git_keep/index b/test/integration/tags2/expected/repo/.git_keep/index similarity index 100% rename from test/integration/tags2/expected/.git_keep/index rename to test/integration/tags2/expected/repo/.git_keep/index diff --git a/test/integration/tags2/expected/repo/.git_keep/info/exclude b/test/integration/tags2/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/tags2/expected/repo/.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/tags2/expected/.git_keep/logs/HEAD b/test/integration/tags2/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/tags2/expected/.git_keep/logs/HEAD rename to test/integration/tags2/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/tags2/expected/.git_keep/logs/refs/heads/master b/test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/tags2/expected/.git_keep/logs/refs/heads/master rename to test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/tags2/expected/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 b/test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 rename to test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/tags2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/tags2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/tags2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/tags2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/tags2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/tags2/expected/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 b/test/integration/tags2/expected/repo/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 rename to test/integration/tags2/expected/repo/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 diff --git a/test/integration/tags2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/tags2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/tags2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/tags2/expected/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb b/test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb rename to test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb diff --git a/test/integration/tags2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/tags2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/tags2/expected/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a b/test/integration/tags2/expected/repo/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a similarity index 100% rename from test/integration/tags2/expected/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a rename to test/integration/tags2/expected/repo/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/tags2/expected/.git_keep/refs/heads/master b/test/integration/tags2/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/tags2/expected/.git_keep/refs/heads/master rename to test/integration/tags2/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/tags2/expected/.git_keep/refs/tags/one b/test/integration/tags2/expected/repo/.git_keep/refs/tags/one similarity index 100% rename from test/integration/tags2/expected/.git_keep/refs/tags/one rename to test/integration/tags2/expected/repo/.git_keep/refs/tags/one diff --git a/test/integration/tags2/expected/.git_keep/refs/tags/two b/test/integration/tags2/expected/repo/.git_keep/refs/tags/two similarity index 100% rename from test/integration/tags2/expected/.git_keep/refs/tags/two rename to test/integration/tags2/expected/repo/.git_keep/refs/tags/two diff --git a/test/integration/tags2/expected/file0 b/test/integration/tags2/expected/repo/file0 similarity index 100% rename from test/integration/tags2/expected/file0 rename to test/integration/tags2/expected/repo/file0 diff --git a/test/integration/tags3/expected/file1 b/test/integration/tags2/expected/repo/file1 similarity index 100% rename from test/integration/tags3/expected/file1 rename to test/integration/tags2/expected/repo/file1 diff --git a/test/integration/undo/expected/file2 b/test/integration/tags2/expected/repo/file2 similarity index 100% rename from test/integration/undo/expected/file2 rename to test/integration/tags2/expected/repo/file2 diff --git a/test/integration/tags3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/tags3/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/tags3/expected/.git_keep/FETCH_HEAD b/test/integration/tags3/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/tags3/expected/.git_keep/FETCH_HEAD rename to test/integration/tags3/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/tags3/expected/.git_keep/HEAD b/test/integration/tags3/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/tags3/expected/.git_keep/HEAD rename to test/integration/tags3/expected/repo/.git_keep/HEAD diff --git a/test/integration/tags3/expected/.git_keep/config b/test/integration/tags3/expected/repo/.git_keep/config similarity index 100% rename from test/integration/tags3/expected/.git_keep/config rename to test/integration/tags3/expected/repo/.git_keep/config diff --git a/test/integration/tags3/expected/repo/.git_keep/description b/test/integration/tags3/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/tags3/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags3/expected/.git_keep/index b/test/integration/tags3/expected/repo/.git_keep/index similarity index 100% rename from test/integration/tags3/expected/.git_keep/index rename to test/integration/tags3/expected/repo/.git_keep/index diff --git a/test/integration/tags3/expected/repo/.git_keep/info/exclude b/test/integration/tags3/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/tags3/expected/repo/.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/tags3/expected/.git_keep/logs/HEAD b/test/integration/tags3/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/tags3/expected/.git_keep/logs/HEAD rename to test/integration/tags3/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/tags3/expected/.git_keep/logs/refs/heads/master b/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/tags3/expected/.git_keep/logs/refs/heads/master rename to test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/tags3/expected/.git_keep/logs/refs/heads/test b/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test similarity index 100% rename from test/integration/tags3/expected/.git_keep/logs/refs/heads/test rename to test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test diff --git a/test/integration/tags3/expected/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 b/test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 rename to test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/tags3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/tags3/expected/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc b/test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc rename to test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc diff --git a/test/integration/tags3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/tags3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 rename to test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 diff --git a/test/integration/tags3/expected/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d b/test/integration/tags3/expected/repo/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d rename to test/integration/tags3/expected/repo/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d diff --git a/test/integration/tags3/expected/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a b/test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a rename to test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a diff --git a/test/integration/tags3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/tags3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/tags3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/tags3/expected/.git_keep/refs/heads/master b/test/integration/tags3/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/tags3/expected/.git_keep/refs/heads/master rename to test/integration/tags3/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/tags3/expected/.git_keep/refs/heads/test b/test/integration/tags3/expected/repo/.git_keep/refs/heads/test similarity index 100% rename from test/integration/tags3/expected/.git_keep/refs/heads/test rename to test/integration/tags3/expected/repo/.git_keep/refs/heads/test diff --git a/test/integration/tags3/expected/.git_keep/refs/tags/one b/test/integration/tags3/expected/repo/.git_keep/refs/tags/one similarity index 100% rename from test/integration/tags3/expected/.git_keep/refs/tags/one rename to test/integration/tags3/expected/repo/.git_keep/refs/tags/one diff --git a/test/integration/tags3/expected/file0 b/test/integration/tags3/expected/repo/file0 similarity index 100% rename from test/integration/tags3/expected/file0 rename to test/integration/tags3/expected/repo/file0 diff --git a/test/integration/tags4/expected/file1 b/test/integration/tags3/expected/repo/file1 similarity index 100% rename from test/integration/tags4/expected/file1 rename to test/integration/tags3/expected/repo/file1 diff --git a/test/integration/tags4/expected/.git_keep/COMMIT_EDITMSG b/test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/tags4/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/tags4/expected/.git_keep/FETCH_HEAD b/test/integration/tags4/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/tags4/expected/.git_keep/FETCH_HEAD rename to test/integration/tags4/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/tags4/expected/repo/.git_keep/HEAD b/test/integration/tags4/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/tags4/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/tags4/expected/.git_keep/config b/test/integration/tags4/expected/repo/.git_keep/config similarity index 100% rename from test/integration/tags4/expected/.git_keep/config rename to test/integration/tags4/expected/repo/.git_keep/config diff --git a/test/integration/tags4/expected/repo/.git_keep/description b/test/integration/tags4/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/tags4/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/tags4/expected/.git_keep/index b/test/integration/tags4/expected/repo/.git_keep/index similarity index 100% rename from test/integration/tags4/expected/.git_keep/index rename to test/integration/tags4/expected/repo/.git_keep/index diff --git a/test/integration/tags4/expected/.git_keep/info/exclude b/test/integration/tags4/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/tags4/expected/.git_keep/info/exclude rename to test/integration/tags4/expected/repo/.git_keep/info/exclude diff --git a/test/integration/tags4/expected/.git_keep/logs/HEAD b/test/integration/tags4/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/tags4/expected/.git_keep/logs/HEAD rename to test/integration/tags4/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/tags4/expected/.git_keep/logs/refs/heads/master b/test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/tags4/expected/.git_keep/logs/refs/heads/master rename to test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/tags4/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/tags4/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/tags4/expected/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 b/test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 rename to test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 diff --git a/test/integration/tags4/expected/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 b/test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 rename to test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/tags4/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/tags4/expected/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 b/test/integration/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 rename to test/integration/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 diff --git a/test/integration/tags4/expected/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 b/test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 similarity index 100% rename from test/integration/tags4/expected/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 rename to test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 diff --git a/test/integration/tags4/expected/.git_keep/packed-refs b/test/integration/tags4/expected/repo/.git_keep/packed-refs similarity index 100% rename from test/integration/tags4/expected/.git_keep/packed-refs rename to test/integration/tags4/expected/repo/.git_keep/packed-refs diff --git a/test/integration/tags4/expected/.git_keep/refs/heads/master b/test/integration/tags4/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/tags4/expected/.git_keep/refs/heads/master rename to test/integration/tags4/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/tags4/expected/.git_keep/refs/tags/atag2 b/test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 similarity index 100% rename from test/integration/tags4/expected/.git_keep/refs/tags/atag2 rename to test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 diff --git a/test/integration/tags4/expected/file0 b/test/integration/tags4/expected/repo/file0 similarity index 100% rename from test/integration/tags4/expected/file0 rename to test/integration/tags4/expected/repo/file0 diff --git a/test/integration/undo/expected/file1 b/test/integration/tags4/expected/repo/file1 similarity index 100% rename from test/integration/undo/expected/file1 rename to test/integration/tags4/expected/repo/file1 diff --git a/test/integration/undo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/undo/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/undo/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/undo/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/undo/expected/.git_keep/FETCH_HEAD b/test/integration/undo/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/undo/expected/.git_keep/FETCH_HEAD rename to test/integration/undo/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/undo/expected/.git_keep/HEAD b/test/integration/undo/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/undo/expected/.git_keep/HEAD rename to test/integration/undo/expected/repo/.git_keep/HEAD diff --git a/test/integration/undo/expected/.git_keep/ORIG_HEAD b/test/integration/undo/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/undo/expected/.git_keep/ORIG_HEAD rename to test/integration/undo/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/undo/expected/.git_keep/config b/test/integration/undo/expected/repo/.git_keep/config similarity index 100% rename from test/integration/undo/expected/.git_keep/config rename to test/integration/undo/expected/repo/.git_keep/config diff --git a/test/integration/undo/expected/repo/.git_keep/description b/test/integration/undo/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/undo/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/undo/expected/.git_keep/index b/test/integration/undo/expected/repo/.git_keep/index similarity index 100% rename from test/integration/undo/expected/.git_keep/index rename to test/integration/undo/expected/repo/.git_keep/index diff --git a/test/integration/undo/expected/repo/.git_keep/info/exclude b/test/integration/undo/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/undo/expected/repo/.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/undo/expected/.git_keep/logs/HEAD b/test/integration/undo/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/undo/expected/.git_keep/logs/HEAD rename to test/integration/undo/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/undo/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/undo/expected/.git_keep/logs/refs/heads/master b/test/integration/undo/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/undo/expected/.git_keep/logs/refs/heads/master rename to test/integration/undo/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/undo/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/undo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/undo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/undo/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/undo/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/undo/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/undo/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/undo/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/undo/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/undo/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/undo/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/undo/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 b/test/integration/undo/expected/repo/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 rename to test/integration/undo/expected/repo/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 diff --git a/test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 b/test/integration/undo/expected/repo/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 rename to test/integration/undo/expected/repo/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 diff --git a/test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/undo/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 b/test/integration/undo/expected/repo/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 rename to test/integration/undo/expected/repo/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 diff --git a/test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 b/test/integration/undo/expected/repo/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 rename to test/integration/undo/expected/repo/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 diff --git a/test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 b/test/integration/undo/expected/repo/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 rename to test/integration/undo/expected/repo/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 diff --git a/test/integration/undo/expected/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e b/test/integration/undo/expected/repo/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e rename to test/integration/undo/expected/repo/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e diff --git a/test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/undo/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 b/test/integration/undo/expected/repo/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 rename to test/integration/undo/expected/repo/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 diff --git a/test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 b/test/integration/undo/expected/repo/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 rename to test/integration/undo/expected/repo/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 diff --git a/test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/undo/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/undo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/undo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/undo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/undo/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/undo/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/undo/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/undo/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa b/test/integration/undo/expected/repo/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa similarity index 100% rename from test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa rename to test/integration/undo/expected/repo/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa diff --git a/test/integration/undo/expected/.git_keep/refs/heads/branch2 b/test/integration/undo/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/undo/expected/.git_keep/refs/heads/branch2 rename to test/integration/undo/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/undo/expected/.git_keep/refs/heads/master b/test/integration/undo/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/undo/expected/.git_keep/refs/heads/master rename to test/integration/undo/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/undo/expected/file0 b/test/integration/undo/expected/repo/file0 similarity index 100% rename from test/integration/undo/expected/file0 rename to test/integration/undo/expected/repo/file0 diff --git a/test/integration/undo2/expected/file1 b/test/integration/undo/expected/repo/file1 similarity index 100% rename from test/integration/undo2/expected/file1 rename to test/integration/undo/expected/repo/file1 diff --git a/test/integration/undo2/expected/file2 b/test/integration/undo/expected/repo/file2 similarity index 100% rename from test/integration/undo2/expected/file2 rename to test/integration/undo/expected/repo/file2 diff --git a/test/integration/undo/expected/file4 b/test/integration/undo/expected/repo/file4 similarity index 100% rename from test/integration/undo/expected/file4 rename to test/integration/undo/expected/repo/file4 diff --git a/test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/undo2/expected/.git_keep/FETCH_HEAD b/test/integration/undo2/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/undo2/expected/.git_keep/FETCH_HEAD rename to test/integration/undo2/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/undo2/expected/repo/.git_keep/HEAD b/test/integration/undo2/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/undo2/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/undo2/expected/.git_keep/ORIG_HEAD b/test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD similarity index 100% rename from test/integration/undo2/expected/.git_keep/ORIG_HEAD rename to test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD diff --git a/test/integration/undo2/expected/.git_keep/config b/test/integration/undo2/expected/repo/.git_keep/config similarity index 100% rename from test/integration/undo2/expected/.git_keep/config rename to test/integration/undo2/expected/repo/.git_keep/config diff --git a/test/integration/undo2/expected/repo/.git_keep/description b/test/integration/undo2/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/undo2/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/undo2/expected/.git_keep/index b/test/integration/undo2/expected/repo/.git_keep/index similarity index 100% rename from test/integration/undo2/expected/.git_keep/index rename to test/integration/undo2/expected/repo/.git_keep/index diff --git a/test/integration/undo2/expected/repo/.git_keep/info/exclude b/test/integration/undo2/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/undo2/expected/repo/.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/undo2/expected/.git_keep/logs/HEAD b/test/integration/undo2/expected/repo/.git_keep/logs/HEAD similarity index 100% rename from test/integration/undo2/expected/.git_keep/logs/HEAD rename to test/integration/undo2/expected/repo/.git_keep/logs/HEAD diff --git a/test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 similarity index 100% rename from test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 rename to test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 diff --git a/test/integration/undo2/expected/.git_keep/logs/refs/heads/master b/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/undo2/expected/.git_keep/logs/refs/heads/master rename to test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master diff --git a/test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 rename to test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 diff --git a/test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 b/test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 rename to test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 rename to test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 diff --git a/test/integration/undo2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/undo2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/undo2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a rename to test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a diff --git a/test/integration/undo2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/undo2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b rename to test/integration/undo2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b diff --git a/test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e b/test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e rename to test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e diff --git a/test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 rename to test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 diff --git a/test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 b/test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 rename to test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 diff --git a/test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 rename to test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 diff --git a/test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 b/test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 rename to test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/undo2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/undo2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c b/test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c rename to test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c diff --git a/test/integration/undo2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/undo2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/undo2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/undo2/expected/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 b/test/integration/undo2/expected/repo/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 rename to test/integration/undo2/expected/repo/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 diff --git a/test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 b/test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 rename to test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 diff --git a/test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 rename to test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 diff --git a/test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a similarity index 100% rename from test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a rename to test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a diff --git a/test/integration/undo2/expected/.git_keep/refs/heads/branch2 b/test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 similarity index 100% rename from test/integration/undo2/expected/.git_keep/refs/heads/branch2 rename to test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 diff --git a/test/integration/undo2/expected/.git_keep/refs/heads/master b/test/integration/undo2/expected/repo/.git_keep/refs/heads/master similarity index 100% rename from test/integration/undo2/expected/.git_keep/refs/heads/master rename to test/integration/undo2/expected/repo/.git_keep/refs/heads/master diff --git a/test/integration/undo2/expected/file0 b/test/integration/undo2/expected/repo/file0 similarity index 100% rename from test/integration/undo2/expected/file0 rename to test/integration/undo2/expected/repo/file0 diff --git a/test/integration/undo2/expected/repo/file1 b/test/integration/undo2/expected/repo/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/undo2/expected/repo/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/undo2/expected/repo/file2 b/test/integration/undo2/expected/repo/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/undo2/expected/repo/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/undo2/expected/file4 b/test/integration/undo2/expected/repo/file4 similarity index 100% rename from test/integration/undo2/expected/file4 rename to test/integration/undo2/expected/repo/file4