diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go index c97b4e5ff..7ddddd9a2 100644 --- a/pkg/integration/integration.go +++ b/pkg/integration/integration.go @@ -60,7 +60,7 @@ func RunTests( testPath := filepath.Join(testDir, test.Name) actualDir := filepath.Join(testPath, "actual") expectedDir := filepath.Join(testPath, "expected") - logf("testPath: %s, actualDir: %s, expectedDir: %s", testPath, actualDir, expectedDir) + logf("path: %s", testPath) // three retries at normal speed for the sake of flakey tests speeds = append(speeds, 1, 1, 1) @@ -91,6 +91,13 @@ func RunTests( if err != nil { return err } + err = os.Rename( + filepath.Join(expectedDir, ".git"), + filepath.Join(expectedDir, ".git_keep"), + ) + if err != nil { + return err + } } actual, expected, err := generateSnapshots(actualDir, expectedDir) @@ -262,22 +269,19 @@ func generateSnapshot(dir string) (string, error) { snapshot := "" - statusCmd := fmt.Sprintf(`git -C %s status`, dir) - statusCmdOutput, err := osCommand.RunCommandWithOutput(statusCmd) - if err != nil { - return "", err + cmdStrs := []string{ + fmt.Sprintf(`git -C %s status`, dir), // file tree + fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir), // log + fmt.Sprintf(`git -C %s tag -n`, dir), // tags } - snapshot += statusCmdOutput + "\n" + for _, cmdStr := range cmdStrs { + // ignoring error for now. If there's an error it could be that there are no results + output, _ := osCommand.RunCommandWithOutput(cmdStr) - logCmd := fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir) - logCmdOutput, err := osCommand.RunCommandWithOutput(logCmd) - if err != nil { - return "", err + snapshot += output + "\n" } - snapshot += logCmdOutput + "\n" - err = filepath.Walk(dir, func(path string, f os.FileInfo, err error) error { if err != nil { return err diff --git a/test/integration/branchAutocomplete/expected/.git_keep/index b/test/integration/branchAutocomplete/expected/.git_keep/index index 20f42788e..79e58d4f5 100644 Binary files a/test/integration/branchAutocomplete/expected/.git_keep/index and b/test/integration/branchAutocomplete/expected/.git_keep/index differ diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD b/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD index d3b3106be..8985b49b4 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 commit (initial): initial commit -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from master to one -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from one to two -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from two to three -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from three to four -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582245 +1000 checkout: moving from four to three +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 commit (initial): initial commit +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from master to one +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from one to two +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from two to three +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from three to four +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671338 +1000 checkout: moving from four to three diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master index a3dea40e4..3781b31e4 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 commit (initial): initial commit +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 commit (initial): initial commit diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/objects/78/77532bb822c0e04f5ecbc78fc414f997ba53cf b/test/integration/branchAutocomplete/expected/.git_keep/objects/78/77532bb822c0e04f5ecbc78fc414f997ba53cf deleted file mode 100644 index 4c5832231..000000000 Binary files a/test/integration/branchAutocomplete/expected/.git_keep/objects/78/77532bb822c0e04f5ecbc78fc414f997ba53cf and /dev/null differ diff --git a/test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d b/test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d new file mode 100644 index 000000000..a9bfbe5b4 Binary files /dev/null and b/test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d differ diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/commit/expected/.git_keep/index b/test/integration/commit/expected/.git_keep/index index b712be28a..6bda11a96 100644 Binary files a/test/integration/commit/expected/.git_keep/index and b/test/integration/commit/expected/.git_keep/index differ diff --git a/test/integration/commit/expected/.git_keep/logs/HEAD b/test/integration/commit/expected/.git_keep/logs/HEAD index 0583e2f0b..66475b1c1 100644 --- a/test/integration/commit/expected/.git_keep/logs/HEAD +++ b/test/integration/commit/expected/.git_keep/logs/HEAD @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 47912ceb0ffa9b205290e75103d9dd6b1878e87b CI 1617580570 +1000 commit (initial): myfile1 -47912ceb0ffa9b205290e75103d9dd6b1878e87b 6bd1486e023f9853f9e6f611cac5ccbc8960ce57 CI 1617580570 +1000 commit: myfile2 -6bd1486e023f9853f9e6f611cac5ccbc8960ce57 980224a1dd75d91fdcab11edc8d25c3ff8f751ba CI 1617580570 +1000 commit: myfile3 -980224a1dd75d91fdcab11edc8d25c3ff8f751ba f4e779d1bd2ad074259ad763210f5b911337054f CI 1617580570 +1000 commit: myfile4 -f4e779d1bd2ad074259ad763210f5b911337054f d0cab53ed70fc66096575c2ccd7ef150b4b470e8 CI 1617580572 +1000 commit: commit +0000000000000000000000000000000000000000 3df3d8761bc0f0828596b11845aeac175b7b7393 CI 1617671339 +1000 commit (initial): myfile1 +3df3d8761bc0f0828596b11845aeac175b7b7393 a7d53cc21fd53100f955377be379423b0e386274 CI 1617671339 +1000 commit: myfile2 +a7d53cc21fd53100f955377be379423b0e386274 4ba4f1ed711a9081fab21bc222469aa5176a01f8 CI 1617671339 +1000 commit: myfile3 +4ba4f1ed711a9081fab21bc222469aa5176a01f8 1440bc6cc888a09dca2329d1060eec6de78d9d21 CI 1617671339 +1000 commit: myfile4 +1440bc6cc888a09dca2329d1060eec6de78d9d21 e7560e2cd4783a261ad32496cefed2d9f69a46e7 CI 1617671342 +1000 commit: commit diff --git a/test/integration/commit/expected/.git_keep/logs/refs/heads/master b/test/integration/commit/expected/.git_keep/logs/refs/heads/master index 0583e2f0b..66475b1c1 100644 --- a/test/integration/commit/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/commit/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 47912ceb0ffa9b205290e75103d9dd6b1878e87b CI 1617580570 +1000 commit (initial): myfile1 -47912ceb0ffa9b205290e75103d9dd6b1878e87b 6bd1486e023f9853f9e6f611cac5ccbc8960ce57 CI 1617580570 +1000 commit: myfile2 -6bd1486e023f9853f9e6f611cac5ccbc8960ce57 980224a1dd75d91fdcab11edc8d25c3ff8f751ba CI 1617580570 +1000 commit: myfile3 -980224a1dd75d91fdcab11edc8d25c3ff8f751ba f4e779d1bd2ad074259ad763210f5b911337054f CI 1617580570 +1000 commit: myfile4 -f4e779d1bd2ad074259ad763210f5b911337054f d0cab53ed70fc66096575c2ccd7ef150b4b470e8 CI 1617580572 +1000 commit: commit +0000000000000000000000000000000000000000 3df3d8761bc0f0828596b11845aeac175b7b7393 CI 1617671339 +1000 commit (initial): myfile1 +3df3d8761bc0f0828596b11845aeac175b7b7393 a7d53cc21fd53100f955377be379423b0e386274 CI 1617671339 +1000 commit: myfile2 +a7d53cc21fd53100f955377be379423b0e386274 4ba4f1ed711a9081fab21bc222469aa5176a01f8 CI 1617671339 +1000 commit: myfile3 +4ba4f1ed711a9081fab21bc222469aa5176a01f8 1440bc6cc888a09dca2329d1060eec6de78d9d21 CI 1617671339 +1000 commit: myfile4 +1440bc6cc888a09dca2329d1060eec6de78d9d21 e7560e2cd4783a261ad32496cefed2d9f69a46e7 CI 1617671342 +1000 commit: commit diff --git a/test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 b/test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 new file mode 100644 index 000000000..0a95d28ba Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 differ diff --git a/test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 b/test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 new file mode 100644 index 000000000..9abdddbd3 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 @@ -0,0 +1,3 @@ +xA +0@Q9iI +"BW=FL!R"~r*Jd ¬D "\S.0p~6fw LzLɝ})2r, \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 b/test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 new file mode 100644 index 000000000..b67f58f76 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 differ diff --git a/test/integration/commit/expected/.git_keep/objects/6b/d1486e023f9853f9e6f611cac5ccbc8960ce57 b/test/integration/commit/expected/.git_keep/objects/6b/d1486e023f9853f9e6f611cac5ccbc8960ce57 deleted file mode 100644 index 93473ae59..000000000 Binary files a/test/integration/commit/expected/.git_keep/objects/6b/d1486e023f9853f9e6f611cac5ccbc8960ce57 and /dev/null differ diff --git a/test/integration/commit/expected/.git_keep/objects/98/0224a1dd75d91fdcab11edc8d25c3ff8f751ba b/test/integration/commit/expected/.git_keep/objects/98/0224a1dd75d91fdcab11edc8d25c3ff8f751ba deleted file mode 100644 index ff762551a..000000000 Binary files a/test/integration/commit/expected/.git_keep/objects/98/0224a1dd75d91fdcab11edc8d25c3ff8f751ba and /dev/null differ diff --git a/test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 b/test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 new file mode 100644 index 000000000..77d08ca03 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 differ diff --git a/test/integration/commit/expected/.git_keep/objects/d0/cab53ed70fc66096575c2ccd7ef150b4b470e8 b/test/integration/commit/expected/.git_keep/objects/d0/cab53ed70fc66096575c2ccd7ef150b4b470e8 deleted file mode 100644 index 1cc91b7dc..000000000 Binary files a/test/integration/commit/expected/.git_keep/objects/d0/cab53ed70fc66096575c2ccd7ef150b4b470e8 and /dev/null differ diff --git a/test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 b/test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 new file mode 100644 index 000000000..9eb3492d1 Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 differ diff --git a/test/integration/commit/expected/.git_keep/objects/f4/e779d1bd2ad074259ad763210f5b911337054f b/test/integration/commit/expected/.git_keep/objects/f4/e779d1bd2ad074259ad763210f5b911337054f deleted file mode 100644 index 874975520..000000000 --- a/test/integration/commit/expected/.git_keep/objects/f4/e779d1bd2ad074259ad763210f5b911337054f +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] 2d"BW=4`D#} 1617582376 +1000 commit (initial): one -459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt -0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI 1617582376 +1000 commit: two -837fbbc4ee6892b828a4a94be22c39814146aafb 459fa5065afddb89a3dccddef39b17b5fd74d041 CI 1617582376 +1000 checkout: moving from conflict to conflict_second -459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt -3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI 1617582377 +1000 commit: three -3633f8c997d88e0c59202f498c8344da9da3aaf4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI 1617582377 +1000 reset: moving to conflict_second -3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second +0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 commit (initial): one +98e834e9cdae1191de7fafb2b6f334bddd0793e8 9976d7948def8b082e9d20135d6a04624d711752 CI 1617671344 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt +9976d7948def8b082e9d20135d6a04624d711752 8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e CI 1617671344 +1000 commit: two +8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 checkout: moving from conflict to conflict_second +98e834e9cdae1191de7fafb2b6f334bddd0793e8 c91b3b139ea108475c19839fcda3a4e33db4ccc9 CI 1617671344 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt +c91b3b139ea108475c19839fcda3a4e33db4ccc9 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI 1617671344 +1000 commit: three +11bdfc142c42c6ffaa904890ab61ec76262ec9ca 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI 1617671344 +1000 reset: moving to conflict_second +11bdfc142c42c6ffaa904890ab61ec76262ec9ca 854f08fa802293e0679d07771547fe9fe5d159e8 CI 1617671365 +1000 commit (merge): Merge branch 'conflict' into conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict index 692e2161e..ba5017ea9 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI 1617582376 +1000 commit (initial): one -459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt -0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI 1617582376 +1000 commit: two +0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 commit (initial): one +98e834e9cdae1191de7fafb2b6f334bddd0793e8 9976d7948def8b082e9d20135d6a04624d711752 CI 1617671344 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt +9976d7948def8b082e9d20135d6a04624d711752 8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e CI 1617671344 +1000 commit: two diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second index b0bd0abaa..d7cdb2c6e 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second @@ -1,4 +1,4 @@ -0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI 1617582376 +1000 branch: Created from conflict -459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt -3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI 1617582377 +1000 commit: three -3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second +0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 branch: Created from conflict +98e834e9cdae1191de7fafb2b6f334bddd0793e8 c91b3b139ea108475c19839fcda3a4e33db4ccc9 CI 1617671344 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt +c91b3b139ea108475c19839fcda3a4e33db4ccc9 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI 1617671344 +1000 commit: three +11bdfc142c42c6ffaa904890ab61ec76262ec9ca 854f08fa802293e0679d07771547fe9fe5d159e8 CI 1617671365 +1000 commit (merge): Merge branch 'conflict' into conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 b/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 deleted file mode 100644 index d3e23bef3..000000000 Binary files a/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 and /dev/null differ diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca b/test/integration/discardFileChanges/expected/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca new file mode 100644 index 000000000..28cbe4c0d --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca @@ -0,0 +1,2 @@ +xA +0@Q9Ed:icf2AR"x|{xh8̏5I\Yr̀Dؐj)4$w{wHrLe!J?~^u^嶽ky M 0F;㠻!z: \ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 b/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 deleted file mode 100644 index db0d71d86..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 +++ /dev/null @@ -1,2 +0,0 @@ -x͊0qy*IՀ |$ -z=9Mht ;@H3FcivĄ"TƤGzi^g2lVf69:Ψe|wn;ukd~ꯑ~Z_l ;|PJu<Ȃ6.DK` \ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 b/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 deleted file mode 100644 index eb8cc0bf7..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9E1f3([Jo?-.bsc#19J@_(p1$@e([UPpg͖QqAO2:֤C鶒BG[Ǻ}/~L \ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 b/test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 new file mode 100644 index 000000000..7744b72d7 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 @@ -0,0 +1,2 @@ +xK0)z?8gɂ0 dcH8@? {< +Mz} qdlpka4 GԩؤN=U(MGaL28f|afäKmN޹=8֭ &h~ZG Udw(on+%W ڐ|=?XK. \ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict index 4a6184f26..5984d595a 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict +++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict @@ -1 +1 @@ -837fbbc4ee6892b828a4a94be22c39814146aafb +8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second index 79ace5379..f7790393b 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second +++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second @@ -1 +1 @@ -39d62c8a07e5103fef16c32373738ce92c4549b7 +854f08fa802293e0679d07771547fe9fe5d159e8 diff --git a/test/integration/filterPath/expected/.git_keep/index b/test/integration/filterPath/expected/.git_keep/index index c1d9597bd..168285e76 100644 Binary files a/test/integration/filterPath/expected/.git_keep/index and b/test/integration/filterPath/expected/.git_keep/index differ diff --git a/test/integration/filterPath/expected/.git_keep/logs/HEAD b/test/integration/filterPath/expected/.git_keep/logs/HEAD index 1f153be50..808615246 100644 --- a/test/integration/filterPath/expected/.git_keep/logs/HEAD +++ b/test/integration/filterPath/expected/.git_keep/logs/HEAD @@ -1,7 +1,7 @@ -0000000000000000000000000000000000000000 4c2d0500178f2642effb990e6d65e073022bf50b CI 1617665274 +1000 commit (initial): file0 -4c2d0500178f2642effb990e6d65e073022bf50b 0315577613e2e65683d0dcf3371940a44ea073ca CI 1617665274 +1000 commit: file1 -0315577613e2e65683d0dcf3371940a44ea073ca 5fbbe6422fb135ada1a05b15f61369747d4e6842 CI 1617665274 +1000 commit: file2 -5fbbe6422fb135ada1a05b15f61369747d4e6842 f712b0a288ced6c49e6cfcf16f7af0991e50849d CI 1617665274 +1000 commit: file1 and file2 -f712b0a288ced6c49e6cfcf16f7af0991e50849d 5192ae05adf946800910d092fb406eb04d56a578 CI 1617665274 +1000 commit: file -5192ae05adf946800910d092fb406eb04d56a578 667b767bf067438c08d47c54fe756a34f238b90d CI 1617665282 +1000 commit: asd -667b767bf067438c08d47c54fe756a34f238b90d d69102e71a2f400fe52feab06516e05cdaf7d0ba CI 1617665289 +1000 commit: test +0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI 1617671367 +1000 commit (initial): file0 +f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI 1617671367 +1000 commit: file1 +4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI 1617671367 +1000 commit: file2 +d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI 1617671367 +1000 commit: file1 and file2 +f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI 1617671367 +1000 commit: file +8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI 1617671375 +1000 commit: asd +af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI 1617671383 +1000 commit: test diff --git a/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master index 1f153be50..808615246 100644 --- a/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master @@ -1,7 +1,7 @@ -0000000000000000000000000000000000000000 4c2d0500178f2642effb990e6d65e073022bf50b CI 1617665274 +1000 commit (initial): file0 -4c2d0500178f2642effb990e6d65e073022bf50b 0315577613e2e65683d0dcf3371940a44ea073ca CI 1617665274 +1000 commit: file1 -0315577613e2e65683d0dcf3371940a44ea073ca 5fbbe6422fb135ada1a05b15f61369747d4e6842 CI 1617665274 +1000 commit: file2 -5fbbe6422fb135ada1a05b15f61369747d4e6842 f712b0a288ced6c49e6cfcf16f7af0991e50849d CI 1617665274 +1000 commit: file1 and file2 -f712b0a288ced6c49e6cfcf16f7af0991e50849d 5192ae05adf946800910d092fb406eb04d56a578 CI 1617665274 +1000 commit: file -5192ae05adf946800910d092fb406eb04d56a578 667b767bf067438c08d47c54fe756a34f238b90d CI 1617665282 +1000 commit: asd -667b767bf067438c08d47c54fe756a34f238b90d d69102e71a2f400fe52feab06516e05cdaf7d0ba CI 1617665289 +1000 commit: test +0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI 1617671367 +1000 commit (initial): file0 +f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI 1617671367 +1000 commit: file1 +4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI 1617671367 +1000 commit: file2 +d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI 1617671367 +1000 commit: file1 and file2 +f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI 1617671367 +1000 commit: file +8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI 1617671375 +1000 commit: asd +af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI 1617671383 +1000 commit: test diff --git a/test/integration/filterPath/expected/.git_keep/objects/03/15577613e2e65683d0dcf3371940a44ea073ca b/test/integration/filterPath/expected/.git_keep/objects/03/15577613e2e65683d0dcf3371940a44ea073ca deleted file mode 100644 index bff83ef7b..000000000 Binary files a/test/integration/filterPath/expected/.git_keep/objects/03/15577613e2e65683d0dcf3371940a44ea073ca and /dev/null differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb b/test/integration/filterPath/expected/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb new file mode 100644 index 000000000..7d99988a7 Binary files /dev/null and b/test/integration/filterPath/expected/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 b/test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 new file mode 100644 index 000000000..1ea243810 Binary files /dev/null and b/test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/4c/2d0500178f2642effb990e6d65e073022bf50b b/test/integration/filterPath/expected/.git_keep/objects/4c/2d0500178f2642effb990e6d65e073022bf50b deleted file mode 100644 index f1b52c23b..000000000 Binary files a/test/integration/filterPath/expected/.git_keep/objects/4c/2d0500178f2642effb990e6d65e073022bf50b and /dev/null differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/51/92ae05adf946800910d092fb406eb04d56a578 b/test/integration/filterPath/expected/.git_keep/objects/51/92ae05adf946800910d092fb406eb04d56a578 deleted file mode 100644 index eeac8dd8d..000000000 Binary files a/test/integration/filterPath/expected/.git_keep/objects/51/92ae05adf946800910d092fb406eb04d56a578 and /dev/null differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842 b/test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842 deleted file mode 100644 index cb982ff10..000000000 --- a/test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842 +++ /dev/null @@ -1,5 +0,0 @@ -xK -0 )/KHR -Y-@҄B_mK0ढ़vPf!W2RP\Kt@I+39c6ny(W=g1idԯlǪo SD - -9~韸˪h~a96 \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/objects/66/7b767bf067438c08d47c54fe756a34f238b90d b/test/integration/filterPath/expected/.git_keep/objects/66/7b767bf067438c08d47c54fe756a34f238b90d deleted file mode 100644 index a53d114d7..000000000 Binary files a/test/integration/filterPath/expected/.git_keep/objects/66/7b767bf067438c08d47c54fe756a34f238b90d and /dev/null differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 b/test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 new file mode 100644 index 000000000..8e06bcc67 Binary files /dev/null and b/test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 b/test/integration/filterPath/expected/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 new file mode 100644 index 000000000..316e3d05c Binary files /dev/null and b/test/integration/filterPath/expected/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/d6/9102e71a2f400fe52feab06516e05cdaf7d0ba b/test/integration/filterPath/expected/.git_keep/objects/d6/9102e71a2f400fe52feab06516e05cdaf7d0ba deleted file mode 100644 index 442dcf720..000000000 Binary files a/test/integration/filterPath/expected/.git_keep/objects/d6/9102e71a2f400fe52feab06516e05cdaf7d0ba and /dev/null differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b b/test/integration/filterPath/expected/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b new file mode 100644 index 000000000..a1504b27d --- /dev/null +++ b/test/integration/filterPath/expected/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b @@ -0,0 +1,2 @@ +xA + E DG(U1# y|nn]C~(LfhsTRɳ@.eu)ﮧ38'f3(_˪/c>A_9WeŪ:6 \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 b/test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 new file mode 100644 index 000000000..de38ddd8b --- /dev/null +++ b/test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 @@ -0,0 +1,2 @@ +xK +0@]$$ "tcL zw[6w0\!DHQs*'LKveA&Q;v(dl(Fj[}5rL>I񻿶}[0 BV=:/k_b; \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de b/test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de new file mode 100644 index 000000000..cb9dd46d0 Binary files /dev/null and b/test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de differ diff --git a/test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d b/test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d deleted file mode 100644 index cff47c2b4..000000000 --- a/test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$3DzI2BӖ[ox> cԜ#jB%j Z -BjC$Մ&7qwm)n"C%oZkus˟"/+<| \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/refs/heads/master b/test/integration/filterPath/expected/.git_keep/refs/heads/master index ab6a49afb..6e1574559 100644 --- a/test/integration/filterPath/expected/.git_keep/refs/heads/master +++ b/test/integration/filterPath/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -d69102e71a2f400fe52feab06516e05cdaf7d0ba +22adc4567aba3d1a0acf28b4cef312922d516aeb diff --git a/test/integration/filterPath2/expected/.git_keep/index b/test/integration/filterPath2/expected/.git_keep/index index 9af85a58c..1f8068706 100644 Binary files a/test/integration/filterPath2/expected/.git_keep/index and b/test/integration/filterPath2/expected/.git_keep/index differ diff --git a/test/integration/filterPath2/expected/.git_keep/logs/HEAD b/test/integration/filterPath2/expected/.git_keep/logs/HEAD index 86d311d47..3875aa5f3 100644 --- a/test/integration/filterPath2/expected/.git_keep/logs/HEAD +++ b/test/integration/filterPath2/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI 1617668883 +1000 commit (initial): file0 -36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI 1617668883 +1000 commit: file1 -7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI 1617668883 +1000 commit: file2 -f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI 1617668883 +1000 commit: file1 and file2 -914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI 1617668883 +1000 commit: file -23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI 1617668905 +1000 commit: test +0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI 1617671384 +1000 commit (initial): file0 +703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI 1617671384 +1000 commit: file1 +a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI 1617671384 +1000 commit: file2 +6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI 1617671384 +1000 commit: file1 and file2 +c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI 1617671384 +1000 commit: file +e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI 1617671407 +1000 commit: test diff --git a/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master index 86d311d47..3875aa5f3 100644 --- a/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI 1617668883 +1000 commit (initial): file0 -36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI 1617668883 +1000 commit: file1 -7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI 1617668883 +1000 commit: file2 -f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI 1617668883 +1000 commit: file1 and file2 -914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI 1617668883 +1000 commit: file -23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI 1617668905 +1000 commit: test +0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI 1617671384 +1000 commit (initial): file0 +703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI 1617671384 +1000 commit: file1 +a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI 1617671384 +1000 commit: file2 +6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI 1617671384 +1000 commit: file1 and file2 +c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI 1617671384 +1000 commit: file +e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI 1617671407 +1000 commit: test diff --git a/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 b/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 deleted file mode 100644 index 96fc3d97b..000000000 Binary files a/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 and /dev/null differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba b/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba deleted file mode 100644 index 012d9528a..000000000 Binary files a/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba and /dev/null differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c b/test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c new file mode 100644 index 000000000..6381fde43 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 b/test/integration/filterPath2/expected/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 new file mode 100644 index 000000000..4b22d36d6 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa b/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa deleted file mode 100644 index aaaac7f83..000000000 --- a/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=BqԌR*q؄`ǯG֮쥟"l(qJ8C'у:)"(mpeHxkN*}k?<ڱɍЀcN_FS]䪮d9O \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 b/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 deleted file mode 100644 index 6aad40784..000000000 Binary files a/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 and /dev/null differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 b/test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 new file mode 100644 index 000000000..59f937373 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 b/test/integration/filterPath2/expected/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 new file mode 100644 index 000000000..af9315fee Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/c1/a2676f74b3007ebb101d4d121cecb4850f1378 b/test/integration/filterPath2/expected/.git_keep/objects/c1/a2676f74b3007ebb101d4d121cecb4850f1378 deleted file mode 100644 index 44fc42ade..000000000 Binary files a/test/integration/filterPath2/expected/.git_keep/objects/c1/a2676f74b3007ebb101d4d121cecb4850f1378 and /dev/null differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 b/test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 new file mode 100644 index 000000000..a47a39706 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 @@ -0,0 +1,2 @@ +xK +0 )/vlJ)dc(L\ޠ0Oe8.PrQѲPʕ3tEB #ufCQ(Yэ*Ύ|HA$S?d[SL)穦N"Zො̈< \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 b/test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 new file mode 100644 index 000000000..bfd62d1d3 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 @@ -0,0 +1,3 @@ +xA + @Ѯ=BqtJ)dc:@lB7Gl/CC8D4a&j$J3$ +yu\ѫy}kM!!Eq L?z}徯r+[hCG`Qg=U[VQ?9 \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef b/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef deleted file mode 100644 index def7bfe3a..000000000 --- a/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef +++ /dev/null @@ -1,2 +0,0 @@ -xA -0a9$i2#`Dn?Z8K;UaT0 9RdDD/w$^;p!DL#D0/ ݲɟOfOSx><\ZkSMMY7u'p: \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/refs/heads/master b/test/integration/filterPath2/expected/.git_keep/refs/heads/master index 4c86c3b07..72fc50fcc 100644 --- a/test/integration/filterPath2/expected/.git_keep/refs/heads/master +++ b/test/integration/filterPath2/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -c1a2676f74b3007ebb101d4d121cecb4850f1378 +92ec47058a2894afbbbd69c5f79bff20c503e686 diff --git a/test/integration/filterPath3/expected/.git_keep/index b/test/integration/filterPath3/expected/.git_keep/index index 9dbc3068b..01d83d753 100644 Binary files a/test/integration/filterPath3/expected/.git_keep/index and b/test/integration/filterPath3/expected/.git_keep/index differ diff --git a/test/integration/filterPath3/expected/.git_keep/logs/HEAD b/test/integration/filterPath3/expected/.git_keep/logs/HEAD index c84dc4885..96c158987 100644 --- a/test/integration/filterPath3/expected/.git_keep/logs/HEAD +++ b/test/integration/filterPath3/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 e92eec6edb251fbc68435ffd5cd7a52f886f062d CI 1617668986 +1000 commit (initial): file0 -e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI 1617668986 +1000 commit: file1 -76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI 1617668986 +1000 commit: file2 -a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI 1617668986 +1000 commit: file1 and file2 -2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI 1617668986 +1000 commit: file -ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI 1617669005 +1000 commit: test +0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI 1617671409 +1000 commit (initial): file0 +8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI 1617671409 +1000 commit: file1 +c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI 1617671409 +1000 commit: file2 +72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI 1617671409 +1000 commit: file1 and file2 +b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI 1617671409 +1000 commit: file +231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI 1617671428 +1000 commit: test diff --git a/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master index c84dc4885..96c158987 100644 --- a/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 e92eec6edb251fbc68435ffd5cd7a52f886f062d CI 1617668986 +1000 commit (initial): file0 -e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI 1617668986 +1000 commit: file1 -76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI 1617668986 +1000 commit: file2 -a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI 1617668986 +1000 commit: file1 and file2 -2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI 1617668986 +1000 commit: file -ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI 1617669005 +1000 commit: test +0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI 1617671409 +1000 commit (initial): file0 +8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI 1617671409 +1000 commit: file1 +c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI 1617671409 +1000 commit: file2 +72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI 1617671409 +1000 commit: file1 and file2 +b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI 1617671409 +1000 commit: file +231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI 1617671428 +1000 commit: test diff --git a/test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 b/test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 new file mode 100644 index 000000000..13b3042dc Binary files /dev/null and b/test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 differ diff --git a/test/integration/filterPath3/expected/.git_keep/objects/2c/7b461ce430e2d743ee239f0c994fd60f90c863 b/test/integration/filterPath3/expected/.git_keep/objects/2c/7b461ce430e2d743ee239f0c994fd60f90c863 deleted file mode 100644 index 1d4480f08..000000000 Binary files a/test/integration/filterPath3/expected/.git_keep/objects/2c/7b461ce430e2d743ee239f0c994fd60f90c863 and /dev/null differ diff --git a/test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 b/test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 new file mode 100644 index 000000000..d1ad09fbd Binary files /dev/null and b/test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 differ diff --git a/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 b/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 deleted file mode 100644 index f28004818..000000000 --- a/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9Ed3I@DǘN&XhL)<=Ƿx[[l/Dd&.)ZXggNlE,6)1yj-K`kJX ڢ3^Ӭ/}ЀSN`Qg=U]7: \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e b/test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e deleted file mode 100644 index a1c1892c9..000000000 Binary files a/test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e and /dev/null differ diff --git a/test/integration/filterPath3/expected/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 b/test/integration/filterPath3/expected/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 new file mode 100644 index 000000000..defb8aeab --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 @@ -0,0 +1,2 @@ +xA +0Fa9c U4R"x|{޴6wS\b6C*=Wsޠ]0c_-Lk{!Yt]ۛ+ \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/a6/68d8690712ac945055bd187ed70fd10541dd38 b/test/integration/filterPath3/expected/.git_keep/objects/a6/68d8690712ac945055bd187ed70fd10541dd38 deleted file mode 100644 index 764edf66f..000000000 Binary files a/test/integration/filterPath3/expected/.git_keep/objects/a6/68d8690712ac945055bd187ed70fd10541dd38 and /dev/null differ diff --git a/test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 b/test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 deleted file mode 100644 index d725a9a7e..000000000 Binary files a/test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 and /dev/null differ diff --git a/test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 b/test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 new file mode 100644 index 000000000..69c3bb790 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 @@ -0,0 +1,3 @@ +xK +0@]$3D<Ƙ`iK7px+kkSt*ĘE-s匹$^(d6u(ENR +[ ԡw;~m^ncl3ZkaN""#2_<{ \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b b/test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b new file mode 100644 index 000000000..7938b29c6 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b @@ -0,0 +1,3 @@ +xM +0F]$?"BW=t2D'kkKGwU(6'KHuk MHЙw}u`3*ptfT +i0Np~mOn);gg5=NuS7uy3_ :n \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d b/test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d new file mode 100644 index 000000000..78eaa8524 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d @@ -0,0 +1,3 @@ +xM +0@a9dEz&`l<=Ƿxemс +EXgr*r,Մ1+fw}u 1617585236 +1000 commit (initial): first commit -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 checkout: moving from master to feature/cherry-picking -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI 1617585236 +1000 commit: first commit freshman year -bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI 1617585236 +1000 commit: second commit subway eat fresh -39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI 1617585236 +1000 commit: third commit fresh -e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI 1617585236 +1000 commit: fourth commit cool -61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI 1617585236 +1000 commit: fifth commit nice -06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI 1617585236 +1000 commit: sixth commit haha -2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI 1617585236 +1000 commit: seventh commit yeah -97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 commit: eighth commit woo -05a37c1f6dc7942f15f80d45254d38735918f670 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 checkout: moving from feature/cherry-picking to develop -05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI 1617585236 +1000 commit: first commit on develop -b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 checkout: moving from develop to master -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI 1617585236 +1000 commit: first commit on master -ab79b4d60771766afa792d180d79f39d60739285 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI 1617585236 +1000 checkout: moving from master to develop -b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI 1617585236 +1000 commit: second commit on develop -54b6871251edf1636a77993925843c6294daa768 ab79b4d60771766afa792d180d79f39d60739285 CI 1617585236 +1000 checkout: moving from develop to master -ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI 1617585236 +1000 commit: second commit on master -ea69b78c08d9698cadc90164ddd19aca6ae05d5f 54b6871251edf1636a77993925843c6294daa768 CI 1617585236 +1000 checkout: moving from master to develop -54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI 1617585236 +1000 commit: third commit on develop -aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI 1617585236 +1000 checkout: moving from develop to master -ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI 1617585236 +1000 commit: third commit on master -8ceeb6cc4581b42aa9deaf9710223615ee17bef2 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI 1617585236 +1000 checkout: moving from master to develop -aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI 1617585236 +1000 commit: fourth commit on develop -8f9f24614460289546a49cb6f12a72b764af14f5 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI 1617585236 +1000 checkout: moving from develop to master -8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 commit: fourth commit on master -9c09cc9177a699a0a920d8c2a84cd2de68295382 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 checkout: moving from master to base_branch -9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 commit: file -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 checkout: moving from base_branch to other_branch -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 checkout: moving from other_branch to base_branch -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI 1617585236 +1000 commit: file changed -010057d2acf80e41ed5e6a8e49cb2c8329ae843b 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 checkout: moving from base_branch to other_branch -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI 1617585237 +1000 commit: asd +0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit +31f2a971f823279ba1ef877be7599da288f6e24b 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from master to feature/cherry-picking +31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year +3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh +d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh +dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool +687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice +17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha +c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah +5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo +c50f7e1375a30118c2886d4b31318579f3419231 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 checkout: moving from feature/cherry-picking to develop +c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop +18c07ac9568c564ececb199f78f64babc92214cb 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from develop to master +31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master +442a53c1b023b4816085fdc4eaa85d0c5fd897e2 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 checkout: moving from master to develop +18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop +7bc178be031c4645110e9accb4accf16902d2d7f 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 checkout: moving from develop to master +442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master +ced01df5f1a270490c1b9d4efe5ceb0c53626279 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 checkout: moving from master to develop +7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop +6dfbfa4bd19cb38608681df40ebb3a78bd13a824 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 checkout: moving from develop to master +ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master +c9b473bec307b18fd94a913658f4d759be63ca47 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 checkout: moving from master to develop +6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop +82db6d0e4502f489719ea0f3dbe7e14413c6d28a c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 checkout: moving from develop to master +c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master +279f068805e089660f7ddd17ff32f66100e0dca5 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 checkout: moving from master to base_branch +279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file +08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch +08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from other_branch to base_branch +08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed +4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch +08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch index b52cadf2c..79e7c0fa4 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 branch: Created from HEAD -9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 commit: file -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI 1617585236 +1000 commit: file changed +0000000000000000000000000000000000000000 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 branch: Created from HEAD +279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file +08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop index 38023c845..6a9c5917a 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 branch: Created from HEAD -05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI 1617585236 +1000 commit: first commit on develop -b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI 1617585236 +1000 commit: second commit on develop -54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI 1617585236 +1000 commit: third commit on develop -aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI 1617585236 +1000 commit: fourth commit on develop +0000000000000000000000000000000000000000 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 branch: Created from HEAD +c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop +18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop +7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop +6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking index a08be0a14..81521b06f 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -1,9 +1,9 @@ -0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 branch: Created from HEAD -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI 1617585236 +1000 commit: first commit freshman year -bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI 1617585236 +1000 commit: second commit subway eat fresh -39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI 1617585236 +1000 commit: third commit fresh -e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI 1617585236 +1000 commit: fourth commit cool -61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI 1617585236 +1000 commit: fifth commit nice -06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI 1617585236 +1000 commit: sixth commit haha -2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI 1617585236 +1000 commit: seventh commit yeah -97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 commit: eighth commit woo +0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 branch: Created from HEAD +31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year +3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh +d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh +dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool +687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice +17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha +c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah +5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master index 5cbf5c2a1..20c99ff0a 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 commit (initial): first commit -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI 1617585236 +1000 commit: first commit on master -ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI 1617585236 +1000 commit: second commit on master -ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI 1617585236 +1000 commit: third commit on master -8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 commit: fourth commit on master +0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit +31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master +442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master +ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master +c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch index 83227bd5e..f188d6a1c 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 branch: Created from HEAD -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI 1617585237 +1000 commit: asd +0000000000000000000000000000000000000000 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 branch: Created from HEAD +08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b b/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b deleted file mode 100644 index 0428f9615..000000000 Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670 deleted file mode 100644 index 23901804e..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F]$d& ]ZR"z| ^+mYvTr6&Eф32b(Ԛ6yvs4=cNKe)VL.jTzm0pƫ|Ҳ>TrdX#jNS]ԕos5|< \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 deleted file mode 100644 index 8cbbd91b8..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]dI)]dB C-xmY@4zeG̝-Z$Frڀm b=x+HH19/)j(%yi;`>OȲmbpphNzN5S7um_|> \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 new file mode 100644 index 000000000..4fd3d95f4 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 new file mode 100644 index 000000000..a042d47f2 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb b/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb new file mode 100644 index 000000000..a58cdfd1c Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 new file mode 100644 index 000000000..0ea06804c --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 @@ -0,0 +1,3 @@ +xA +0E]$cҤc2P4%-xk)WԧDXa@5iL#,)ENj&kzǜ c!3L+RL3ܦ!*K.\;` \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b b/test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b new file mode 100644 index 000000000..60cc78ba9 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7 deleted file mode 100644 index 4696cdc84..000000000 Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 new file mode 100644 index 000000000..7fafc3d92 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 new file mode 100644 index 000000000..cc8df6e44 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 @@ -0,0 +1,2 @@ +xK +@ @])dU N[</quj-&IDeyJc1!57 F|ƅ{֍Mjk% f-wM<+9TvFYXqzێ4:9Ur9:/Rs31B \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f deleted file mode 100644 index 68717092a..000000000 Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 deleted file mode 100644 index 8bd499914..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]$6?c2PRSۏxR SE`ُP$O.d,rFI#f -9vy5,hMI(O1C+>J6r)=m3jU_&*co+4/(fA \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 deleted file mode 100644 index 07c4733e6..000000000 Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 deleted file mode 100644 index 84d67dadd..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 +++ /dev/null @@ -1,5 +0,0 @@ -xM -0a93 "tcL )io xR-e%zc [!ZOtـaqBcM -:SWQ+|$Oqęx zGm0/p;OZn\px8+)8\~ - -/@ \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 deleted file mode 100644 index 781dfa0c9..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 +++ /dev/null @@ -1,3 +0,0 @@ -xK -@ @])$_LuJ+x,p73$*Yx"SD S -C)nRY)"A|b(K~m8uYv(m9e4$2 ݗ~~m~T{ٽ? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 deleted file mode 100644 index ae401c393..000000000 Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 deleted file mode 100644 index 2480055e3..000000000 Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 deleted file mode 100644 index 6425bd3e4..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 +++ /dev/null @@ -1,3 +0,0 @@ -xK -1]$aVs -ƑAoUPz]*?P|W(\síwQ%Mc0HfɂQ{HB4Ѽa^Nxq_ӵEC֚/NuriNJ\Fop3D \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee new file mode 100644 index 000000000..adc43e7e2 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 new file mode 100644 index 000000000..1fefa24b6 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67 deleted file mode 100644 index 850d9678d..000000000 Binary files a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 new file mode 100644 index 000000000..e7b2a49ea Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 new file mode 100644 index 000000000..8e7055771 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 @@ -0,0 +1,2 @@ +xA +0E]d&MDztiJ.=%<]pQ| S >kѦ>x׵sN(풋1,NBZ(;\K/R ShC8"ֶSU͡R~26_z1@ \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 new file mode 100644 index 000000000..035d7ebef Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 new file mode 100644 index 000000000..aa4879a75 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 @@ -0,0 +1,3 @@ +xA +0E]df$DzdfBkK-xw{e]{Fh xTI9yQTL,0j7>kT@GRJ*@ +#ifƅK6 .tOZd]@bwGBDT?u{UUPf>? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 deleted file mode 100644 index 6fc26c12d..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]d$#Lh#x| ^=xA;&%$ lu֙8 i,&Ū=5yv01r!C4XRd2Vs4QJ>o tOZ\x[o0]pDT=>/5/? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f deleted file mode 100644 index b9fd215e0..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f +++ /dev/null @@ -1,2 +0,0 @@ -xM -0]d3 ]yOQ0Mi#x|#^/R Cr1d5G$! ]081U4> ;A$7I;Lg뿁ƍJ^^7npn>)rMGT՞c]0 ;>;? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch index 1be09a6b2..60c28ebd6 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch @@ -1 +1 @@ -010057d2acf80e41ed5e6a8e49cb2c8329ae843b +4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop index 3aaf94808..b4d7d5850 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -8f9f24614460289546a49cb6f12a72b764af14f5 +82db6d0e4502f489719ea0f3dbe7e14413c6d28a diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking index f91b953a9..02e8ef0f4 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking @@ -1 +1 @@ -05a37c1f6dc7942f15f80d45254d38735918f670 +c50f7e1375a30118c2886d4b31318579f3419231 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master index 0b95f1f06..d4f5ac796 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -9c09cc9177a699a0a920d8c2a84cd2de68295382 +279f068805e089660f7ddd17ff32f66100e0dca5 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch index 582e1c389..d324b15b4 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch @@ -1 +1 @@ -c622516f02266679505b89103007ec04b8748b67 +8cd762c119834784fdbf97e9bb3b4c15e804ebaa diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD index 21c1550a1..c7c35a1e7 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -1dd0692a163379d160e23ac52509d909b41b0a35 +562af0640203fb5a6e92c090d8d1ded26806d2c4 diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/.git_keep/index index f2656bed9..4e5ae2746 100644 Binary files a/test/integration/mergeConflicts/expected/.git_keep/index and b/test/integration/mergeConflicts/expected/.git_keep/index differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD index 587c36a83..6ebcd55da 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD @@ -1,34 +1,34 @@ -0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 commit (initial): first commit -c5507059e2aa65bc2dad65bd38b879079b69c48c c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 checkout: moving from master to feature/cherry-picking -c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI 1617586185 +1000 commit: first commit freshman year -54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI 1617586185 +1000 commit: second commit subway eat fresh -5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI 1617586185 +1000 commit: third commit fresh -a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI 1617586185 +1000 commit: fourth commit cool -174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI 1617586185 +1000 commit: fifth commit nice -eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI 1617586185 +1000 commit: sixth commit haha -00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI 1617586185 +1000 commit: seventh commit yeah -fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 commit: eighth commit woo -f05cdc6bb7f98285583770bec5a8d307a7805bd6 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 checkout: moving from feature/cherry-picking to develop -f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586185 +1000 commit: first commit on develop -417a3f75c440e565dab9b5afa78747ef37446348 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 checkout: moving from develop to master -c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 commit: first commit on master -a2a2ee2fe3ad96c470a921fe71c1216d93188c9b 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586186 +1000 checkout: moving from master to develop -417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 commit: second commit on develop -4e71d4ff127ae9e3d482239e16dc1d78e56feec0 a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 checkout: moving from develop to master -a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 commit: second commit on master -a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 checkout: moving from master to develop -4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 commit: third commit on develop -fe1f8f70f67822120b40d9d704011aec6e17c3a7 a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 checkout: moving from develop to master -a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 commit: third commit on master -f2a15f45b921460e675a8849db39de008b2c03cb fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 checkout: moving from master to develop -fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI 1617586186 +1000 commit: fourth commit on develop -91e16cacdb23b0b5515c6109ea301b0cb6367010 f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 checkout: moving from develop to master -f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 commit: fourth commit on master -1b3e191104f74b8e4054e22e9ab3b9dcfe299743 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 checkout: moving from master to base_branch -1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 commit: file -8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from base_branch to other_branch -8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from other_branch to base_branch -8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI 1617586186 +1000 commit: file changed -0539c9baf43fb1939d8f56695ceb08a86e8e1fae 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from base_branch to other_branch -8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI 1617586188 +1000 commit: asd -1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch +0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 commit (initial): first commit +1618ce1085acb41fd710e279ac38911aadfb0a09 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 checkout: moving from master to feature/cherry-picking +1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI 1617671441 +1000 commit: first commit freshman year +b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI 1617671441 +1000 commit: second commit subway eat fresh +f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI 1617671441 +1000 commit: third commit fresh +edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI 1617671441 +1000 commit: fourth commit cool +cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI 1617671441 +1000 commit: fifth commit nice +b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI 1617671441 +1000 commit: sixth commit haha +df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI 1617671441 +1000 commit: seventh commit yeah +1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 commit: eighth commit woo +d3e2708327280097b5e1f8ab69309934b24f8b64 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 checkout: moving from feature/cherry-picking to develop +d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 commit: first commit on develop +a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 checkout: moving from develop to master +1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 commit: first commit on master +f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 checkout: moving from master to develop +a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 commit: second commit on develop +55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 checkout: moving from develop to master +f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 commit: second commit on master +a19ec0b99e516795f349033f09383f87be0b74e9 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 checkout: moving from master to develop +55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 commit: third commit on develop +dd259e90c3748e269bdf1ee3ce537a006d2394aa a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 checkout: moving from develop to master +a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 commit: third commit on master +61db24350a92fa37b2fe35f13eb3dd3f7655f6cf dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 checkout: moving from master to develop +dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI 1617671441 +1000 commit: fourth commit on develop +e563585cb87cc39b553ca421902d631ea8890118 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 checkout: moving from develop to master +61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 commit: fourth commit on master +559043765dc6c32c943b6278b4abbff1e6f52839 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 checkout: moving from master to base_branch +559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 commit: file +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from base_branch to other_branch +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from other_branch to base_branch +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI 1617671441 +1000 commit: file changed +341cf8213827614a274c750cd7dec4307eb41de7 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from base_branch to other_branch +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI 1617671444 +1000 commit: asd +562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch index d924ca3c2..6e46aa010 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 branch: Created from HEAD -1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 commit: file -8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI 1617586186 +1000 commit: file changed +0000000000000000000000000000000000000000 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 branch: Created from HEAD +559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 commit: file +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI 1617671441 +1000 commit: file changed diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop index bb6a166b8..83fe584c1 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 branch: Created from HEAD -f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586185 +1000 commit: first commit on develop -417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 commit: second commit on develop -4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 commit: third commit on develop -fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI 1617586186 +1000 commit: fourth commit on develop +0000000000000000000000000000000000000000 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 branch: Created from HEAD +d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 commit: first commit on develop +a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 commit: second commit on develop +55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 commit: third commit on develop +dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI 1617671441 +1000 commit: fourth commit on develop diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking index fe42f6cc0..f90ef71fb 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -1,9 +1,9 @@ -0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 branch: Created from HEAD -c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI 1617586185 +1000 commit: first commit freshman year -54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI 1617586185 +1000 commit: second commit subway eat fresh -5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI 1617586185 +1000 commit: third commit fresh -a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI 1617586185 +1000 commit: fourth commit cool -174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI 1617586185 +1000 commit: fifth commit nice -eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI 1617586185 +1000 commit: sixth commit haha -00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI 1617586185 +1000 commit: seventh commit yeah -fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 commit: eighth commit woo +0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 branch: Created from HEAD +1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI 1617671441 +1000 commit: first commit freshman year +b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI 1617671441 +1000 commit: second commit subway eat fresh +f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI 1617671441 +1000 commit: third commit fresh +edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI 1617671441 +1000 commit: fourth commit cool +cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI 1617671441 +1000 commit: fifth commit nice +b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI 1617671441 +1000 commit: sixth commit haha +df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI 1617671441 +1000 commit: seventh commit yeah +1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 commit: eighth commit woo diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master index fb187ba0e..3ac4fad17 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 commit (initial): first commit -c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 commit: first commit on master -a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 commit: second commit on master -a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 commit: third commit on master -f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 commit: fourth commit on master +0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 commit (initial): first commit +1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 commit: first commit on master +f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 commit: second commit on master +a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 commit: third commit on master +61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 commit: fourth commit on master diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch index 294c5fa02..cb2cf3437 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 branch: Created from HEAD -8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI 1617586188 +1000 commit: asd -1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch +0000000000000000000000000000000000000000 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 branch: Created from HEAD +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI 1617671444 +1000 commit: asd +562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d b/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d deleted file mode 100644 index fc38886e8..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]d&DzI:F-xh`ѝڦ -\p1.RÓDbˤ]lV@5qco++3c`c|ڼl0pƻRק^Ro@?Lh8Oܼ{g,/= \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae b/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae deleted file mode 100644 index d42d27687..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae +++ /dev/null @@ -1,3 +0,0 @@ -xM - @=BqtJ)dc86`o[<ޖeRCD7@BC n)KmPŪ=v\`$I -anD*z}oCA 1F'Wm~)/! << \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 b/test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 new file mode 100644 index 000000000..5c37019a9 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 b/test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 new file mode 100644 index 000000000..d75634d71 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 deleted file mode 100644 index 15d9caba9..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 +++ /dev/null @@ -1,3 +0,0 @@ -xK - E;v O'R(˸C -1W::p9N:W\zKG8+ dݤVh9&> LvVV/ gjLcOP˃K+!+Ozm m> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 deleted file mode 100644 index dd70f37c5..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]dMDzI21%-x/RSo"08i$u9zC1ӄD,)M^d6- ;} -OqA`^:/wpٞrป, A.U{+4/(>l&A/ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 b/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 deleted file mode 100644 index 5e5e92605..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 b/test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 new file mode 100644 index 000000000..99413297c --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 @@ -0,0 +1,4 @@ +xM +0F]d&͏cPR xŰ*,g>Ӟ +MGΌX; +RlFav(91tRCN9~i`4} (?UϹy諵Lu^=jq|@kΨV=:9WRWiP_P} mA \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 b/test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 new file mode 100644 index 000000000..cd691a15d --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 @@ -0,0 +1,6 @@ +xA +0E]d&S +"BW=F&3EmJ x>/eyTDLR4`2wG1Tz>dĈmiB"C"10Er䅣 0eoI6) +(#8"F[T?i +? +jo^B \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 new file mode 100644 index 000000000..785d58c4c Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec b/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec deleted file mode 100644 index 1b6dcc55d..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf b/test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf new file mode 100644 index 000000000..744a40a57 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf @@ -0,0 +1,2 @@ +xM +0a9i&?"BW=FNhR#x| ^7. :SUS 轋(0zǒ8ZT̖v}6H$:bQG>+-xp[bȊ9I6;\ᮟT^Ƶހ<Lh8ܴy')XP > \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 b/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 deleted file mode 100644 index 1ed4cdd2a..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0] '#/Xhl)<9a&ﭭ]*V~RS9B1آetLs=8ӄ+2՛`h iJ\rff_)Eoldž[C* N'ĠcO]u:U9P \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 deleted file mode 100644 index 979a5d3db..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F]d&DzLИR_<;hSo" ɐ \ʆC8G1ImɫC.3fNiLD+qޗ`6r܁,Yr΄XS]U{ 2/Hn fAc \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 new file mode 100644 index 000000000..5a18068af --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 @@ -0,0 +1,2 @@ +xM +0]di"BW=$`F>ދgv@h,و 9k f${BqrSR6ΣC$6yMIfO:8ۣ0/p|l/Zn@lG3!괟jg]A]mPA# \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b new file mode 100644 index 000000000..f93dc352f --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b @@ -0,0 +1,4 @@ +xK +0@]d&| +"BW=FL6F{R]&<]49x L)JbF<Ǚ66F` +0F:Qs ѱ_Qw]>rIu93Qjʴ?*+dy\7> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b deleted file mode 100644 index 1db4d9945..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b +++ /dev/null @@ -1,4 +0,0 @@ -xK -1D] AD'cLo *(TKٺ4 -O1K-;@MV=9@2F&0يLޫQܷlZ;Uhs$pQi 1~Ga:Nwp^zo~mZh;UϺ9T:OB ?@] \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 b/test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 new file mode 100644 index 000000000..1ab3c4866 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a b/test/integration/mergeConflicts/expected/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a new file mode 100644 index 000000000..03daf0b70 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a @@ -0,0 +1,3 @@ +x +0E]+f/H&}U?c2cKAފ?r\qu( UAc]PAjCD֬(5 +Y4xcDccb;#2-.pKzIt6al5*7q[E1c< ;C| \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c b/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c deleted file mode 100644 index 4737ac8dd..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 b/test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 new file mode 100644 index 000000000..58dd790dc Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 b/test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 new file mode 100644 index 000000000..139da07d2 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 @@ -0,0 +1,3 @@ +xM +0F]$I"BW=F2NmR"z| ^{[Kݡo"%̥LlbdԚ7yv +">Y p9&_}n #*\ׇ a!Qku?O\r ? ޭ/Ճ=w \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa b/test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa new file mode 100644 index 000000000..f66748219 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa @@ -0,0 +1,3 @@ +xK +0@]d&i@DcL -XSJ>ރWں.,敖BX'aRgb=˾:LS1Bà1{,PkjCf.$5Zks@gxx[ P$L ͗~>/ +&}m@; \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 b/test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 new file mode 100644 index 000000000..0e14fe828 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 b/test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 new file mode 100644 index 000000000..0c4f12bc5 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 @@ -0,0 +1,2 @@ +xM + F/G?PJ!C )Ĕ^_:(Ko1&OfeeރWCTD\`C89;0<ԎYH -I$#A_>-pݯ>Tv. ZkvOuS7}7_|A@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e b/test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e new file mode 100644 index 000000000..c75a873ad Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 b/test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 new file mode 100644 index 000000000..1190b1af3 Binary files /dev/null and b/test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 b/test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 new file mode 100644 index 000000000..572556d0f --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 @@ -0,0 +1 @@ +xϻj1ӹ4 +yl]-B1~,i5u`FW}&e#.YRuӌb%#PjJb:1./)2E*4(L{,˻>Һ Hȋ'+τӱ'OڿrO[YTຍm,?>R \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 b/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 deleted file mode 100644 index 73675419e..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]dO@DǘdF*X[j/k0DcBԾd}!6%Q%ԅsjM _]RB`H63:rlI٦ea0MzC]蠣OA'{>O]=_&u~> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 b/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 deleted file mode 100644 index d1205a6da..000000000 Binary files a/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 and /dev/null differ diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch index bc3596fef..50316367d 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch @@ -1 +1 @@ -0539c9baf43fb1939d8f56695ceb08a86e8e1fae +341cf8213827614a274c750cd7dec4307eb41de7 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop index f2eaf134c..ffaafc687 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -91e16cacdb23b0b5515c6109ea301b0cb6367010 +e563585cb87cc39b553ca421902d631ea8890118 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking index c65182816..848e686fb 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking @@ -1 +1 @@ -f05cdc6bb7f98285583770bec5a8d307a7805bd6 +d3e2708327280097b5e1f8ab69309934b24f8b64 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master index 1b286a9b0..7874adebd 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -1b3e191104f74b8e4054e22e9ab3b9dcfe299743 +559043765dc6c32c943b6278b4abbff1e6f52839 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch index 085978d43..1e2bd76fa 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch @@ -1 +1 @@ -32129537d40d9fb35cf3dd6fba7985870142324b +f8dd12b796f400be7f59d9471670c3080f9c90a1 diff --git a/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD index d0df06fd0..c41f6f982 100644 --- a/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD +++ b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -29f276b162bc253add87f21f45013cbce86c4ab0 +7a40dadc0814bf7f1418d005eae184848a9f1c94 diff --git a/test/integration/patchBuilding/expected/.git_keep/index b/test/integration/patchBuilding/expected/.git_keep/index index 38bcf88c7..41d8b9d80 100644 Binary files a/test/integration/patchBuilding/expected/.git_keep/index and b/test/integration/patchBuilding/expected/.git_keep/index differ diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding/expected/.git_keep/logs/HEAD index 561ac2a79..fbfbb9e34 100644 --- a/test/integration/patchBuilding/expected/.git_keep/logs/HEAD +++ b/test/integration/patchBuilding/expected/.git_keep/logs/HEAD @@ -1,10 +1,10 @@ -0000000000000000000000000000000000000000 5c021eb54f0eac90e22f363ee9214454a55b81de CI 1617586445 +1000 commit (initial): myfile1 -5c021eb54f0eac90e22f363ee9214454a55b81de aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586445 +1000 commit: myfile2 -aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586445 +1000 commit: myfile2 update -29f276b162bc253add87f21f45013cbce86c4ab0 5b64b56ce78c5611173e73ee34cf0eb6fddac926 CI 1617586445 +1000 commit: myfile3 -5b64b56ce78c5611173e73ee34cf0eb6fddac926 aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586451 +1000 rebase -i (start): checkout aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c -aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586451 +1000 rebase -i: fast-forward -29f276b162bc253add87f21f45013cbce86c4ab0 cc25737e7c56a583e7f22d97c66f304e90689206 CI 1617586451 +1000 commit (amend): myfile2 update -cc25737e7c56a583e7f22d97c66f304e90689206 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (pick): myfile3 -ef37d114b15acc27c17e75fa36ccfa1e50e913a8 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (finish): returning to refs/heads/master -ef37d114b15acc27c17e75fa36ccfa1e50e913a8 a3f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 CI 1617586454 +1000 commit: test +0000000000000000000000000000000000000000 01ed22faef05591076721466e07fb10962642887 CI 1617671463 +1000 commit (initial): myfile1 +01ed22faef05591076721466e07fb10962642887 922fc2ed1965fe8436ce7837c634379f14faf3c3 CI 1617671463 +1000 commit: myfile2 +922fc2ed1965fe8436ce7837c634379f14faf3c3 7a40dadc0814bf7f1418d005eae184848a9f1c94 CI 1617671463 +1000 commit: myfile2 update +7a40dadc0814bf7f1418d005eae184848a9f1c94 2479abfe7bd6b64a753d3c3797f614bbb422f627 CI 1617671463 +1000 commit: myfile3 +2479abfe7bd6b64a753d3c3797f614bbb422f627 922fc2ed1965fe8436ce7837c634379f14faf3c3 CI 1617671469 +1000 rebase -i (start): checkout 922fc2ed1965fe8436ce7837c634379f14faf3c3 +922fc2ed1965fe8436ce7837c634379f14faf3c3 7a40dadc0814bf7f1418d005eae184848a9f1c94 CI 1617671469 +1000 rebase -i: fast-forward +7a40dadc0814bf7f1418d005eae184848a9f1c94 244cec6fa9704d5dc61fc5e60faba4125dfe3baa CI 1617671469 +1000 commit (amend): myfile2 update +244cec6fa9704d5dc61fc5e60faba4125dfe3baa c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 CI 1617671469 +1000 rebase -i (pick): myfile3 +c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 CI 1617671469 +1000 rebase -i (finish): returning to refs/heads/master +c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 92571130f37c70766612048271f1d4dca63ef0b5 CI 1617671472 +1000 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master index 0f186d9f1..80ec4b0e9 100644 --- a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 5c021eb54f0eac90e22f363ee9214454a55b81de CI 1617586445 +1000 commit (initial): myfile1 -5c021eb54f0eac90e22f363ee9214454a55b81de aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586445 +1000 commit: myfile2 -aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586445 +1000 commit: myfile2 update -29f276b162bc253add87f21f45013cbce86c4ab0 5b64b56ce78c5611173e73ee34cf0eb6fddac926 CI 1617586445 +1000 commit: myfile3 -5b64b56ce78c5611173e73ee34cf0eb6fddac926 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (finish): refs/heads/master onto aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c -ef37d114b15acc27c17e75fa36ccfa1e50e913a8 a3f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 CI 1617586454 +1000 commit: test +0000000000000000000000000000000000000000 01ed22faef05591076721466e07fb10962642887 CI 1617671463 +1000 commit (initial): myfile1 +01ed22faef05591076721466e07fb10962642887 922fc2ed1965fe8436ce7837c634379f14faf3c3 CI 1617671463 +1000 commit: myfile2 +922fc2ed1965fe8436ce7837c634379f14faf3c3 7a40dadc0814bf7f1418d005eae184848a9f1c94 CI 1617671463 +1000 commit: myfile2 update +7a40dadc0814bf7f1418d005eae184848a9f1c94 2479abfe7bd6b64a753d3c3797f614bbb422f627 CI 1617671463 +1000 commit: myfile3 +2479abfe7bd6b64a753d3c3797f614bbb422f627 c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 CI 1617671469 +1000 rebase -i (finish): refs/heads/master onto 922fc2ed1965fe8436ce7837c634379f14faf3c3 +c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 92571130f37c70766612048271f1d4dca63ef0b5 CI 1617671472 +1000 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 b/test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 new file mode 100644 index 000000000..8bc753223 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa b/test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa new file mode 100644 index 000000000..3cc9bff71 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 b/test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 new file mode 100644 index 000000000..5a46f9e62 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 b/test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 deleted file mode 100644 index e2b671e92..000000000 Binary files a/test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 and /dev/null differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/5b/64b56ce78c5611173e73ee34cf0eb6fddac926 b/test/integration/patchBuilding/expected/.git_keep/objects/5b/64b56ce78c5611173e73ee34cf0eb6fddac926 deleted file mode 100644 index 82889cfd2..000000000 Binary files a/test/integration/patchBuilding/expected/.git_keep/objects/5b/64b56ce78c5611173e73ee34cf0eb6fddac926 and /dev/null differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/5c/021eb54f0eac90e22f363ee9214454a55b81de b/test/integration/patchBuilding/expected/.git_keep/objects/5c/021eb54f0eac90e22f363ee9214454a55b81de deleted file mode 100644 index 9562371e1..000000000 --- a/test/integration/patchBuilding/expected/.git_keep/objects/5c/021eb54f0eac90e22f363ee9214454a55b81de +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9I#M&XR"~̖r*Jd7Y)J4$gᚲ\zWa>NO$Vf 0{8"rgߺJ3, \ No newline at end of file diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 b/test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 new file mode 100644 index 000000000..e5abc6ca1 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 b/test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 new file mode 100644 index 000000000..cc91b81d5 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 b/test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 new file mode 100644 index 000000000..e19be1d70 Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 b/test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 deleted file mode 100644 index 61ba3fdc1..000000000 --- a/test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0a9E4?ӀU1N`m<=ۇw2ϏmB:UrT"bSEJ"WA&x㤶@RՐͪ2pݗ?_'Nϙ%9LDn}5w9 \ No newline at end of file diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c b/test/integration/patchBuilding/expected/.git_keep/objects/aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c deleted file mode 100644 index 537c0c7a9..000000000 Binary files a/test/integration/patchBuilding/expected/.git_keep/objects/aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c and /dev/null differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 b/test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 new file mode 100644 index 000000000..9a0ede51c Binary files /dev/null and b/test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 b/test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 deleted file mode 100644 index 0740abfde..000000000 Binary files a/test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 and /dev/null differ diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 b/test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 deleted file mode 100644 index e66271bda..000000000 Binary files a/test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 and /dev/null differ diff --git a/test/integration/patchBuilding/expected/.git_keep/refs/heads/master b/test/integration/patchBuilding/expected/.git_keep/refs/heads/master index d0b9d4c4c..29f2f53b9 100644 --- a/test/integration/patchBuilding/expected/.git_keep/refs/heads/master +++ b/test/integration/patchBuilding/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -a3f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 +92571130f37c70766612048271f1d4dca63ef0b5 diff --git a/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD index 073c4e65c..1af6e19fc 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD +++ b/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -28d8e975606801b4ba31b292312d4030109e4f1a +ad27dd25048bff07da92d2d9d829e4dd75472da4 diff --git a/test/integration/patchBuilding2/expected/.git_keep/index b/test/integration/patchBuilding2/expected/.git_keep/index index d1693a13d..a3c15b76e 100644 Binary files a/test/integration/patchBuilding2/expected/.git_keep/index and b/test/integration/patchBuilding2/expected/.git_keep/index differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD index ee1e9a05a..507fc33cd 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 CI 1617586780 +1000 commit (initial): myfile1 -a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 5677dceabb2de40c648da3c831d037b429375131 CI 1617586780 +1000 commit: myfile2 -5677dceabb2de40c648da3c831d037b429375131 0a1e762c8cd2587e05d56acb7294937adb3b90b4 CI 1617586780 +1000 commit: myfile2 update -0a1e762c8cd2587e05d56acb7294937adb3b90b4 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586780 +1000 commit: myfile3 -28d8e975606801b4ba31b292312d4030109e4f1a 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586788 +1000 reset: moving to HEAD -28d8e975606801b4ba31b292312d4030109e4f1a 808f2484733488c2b6bd2f3773b04437bbb20434 CI 1617586799 +1000 commit: test +0000000000000000000000000000000000000000 9a939087472cfaf305396d4b177ee888ced193d9 CI 1617671474 +1000 commit (initial): myfile1 +9a939087472cfaf305396d4b177ee888ced193d9 5063202049f1980e035c390732a7e6da8783357f CI 1617671474 +1000 commit: myfile2 +5063202049f1980e035c390732a7e6da8783357f d0ec73019f9c5e426c9b37fa58757855367580a5 CI 1617671474 +1000 commit: myfile2 update +d0ec73019f9c5e426c9b37fa58757855367580a5 ad27dd25048bff07da92d2d9d829e4dd75472da4 CI 1617671474 +1000 commit: myfile3 +ad27dd25048bff07da92d2d9d829e4dd75472da4 ad27dd25048bff07da92d2d9d829e4dd75472da4 CI 1617671483 +1000 reset: moving to HEAD +ad27dd25048bff07da92d2d9d829e4dd75472da4 e474bc2d1712ed5fdf14fb7223392f1b0dcc8d37 CI 1617671494 +1000 commit: test diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master index 2b2404ea1..4789bfb1e 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 CI 1617586780 +1000 commit (initial): myfile1 -a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 5677dceabb2de40c648da3c831d037b429375131 CI 1617586780 +1000 commit: myfile2 -5677dceabb2de40c648da3c831d037b429375131 0a1e762c8cd2587e05d56acb7294937adb3b90b4 CI 1617586780 +1000 commit: myfile2 update -0a1e762c8cd2587e05d56acb7294937adb3b90b4 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586780 +1000 commit: myfile3 -28d8e975606801b4ba31b292312d4030109e4f1a 808f2484733488c2b6bd2f3773b04437bbb20434 CI 1617586799 +1000 commit: test +0000000000000000000000000000000000000000 9a939087472cfaf305396d4b177ee888ced193d9 CI 1617671474 +1000 commit (initial): myfile1 +9a939087472cfaf305396d4b177ee888ced193d9 5063202049f1980e035c390732a7e6da8783357f CI 1617671474 +1000 commit: myfile2 +5063202049f1980e035c390732a7e6da8783357f d0ec73019f9c5e426c9b37fa58757855367580a5 CI 1617671474 +1000 commit: myfile2 update +d0ec73019f9c5e426c9b37fa58757855367580a5 ad27dd25048bff07da92d2d9d829e4dd75472da4 CI 1617671474 +1000 commit: myfile3 +ad27dd25048bff07da92d2d9d829e4dd75472da4 e474bc2d1712ed5fdf14fb7223392f1b0dcc8d37 CI 1617671494 +1000 commit: test diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash index e9334f7fa..26825b7bb 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash @@ -1 +1 @@ -0000000000000000000000000000000000000000 06855901b0dbd8859a7ef5437380cef241f60187 CI 1617586788 +1000 On master: asd +0000000000000000000000000000000000000000 2c60d208ba3ec966b77ca756237843af7584cf93 CI 1617671483 +1000 On master: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 b/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 deleted file mode 100644 index 29fc008b6..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 b/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 deleted file mode 100644 index 95d201062..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 b/test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 new file mode 100644 index 000000000..0f416d438 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a b/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a deleted file mode 100644 index 0101e824a..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 b/test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 new file mode 100644 index 000000000..824ef6445 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 @@ -0,0 +1,2 @@ +xϻjA  Akn!+Wy!׬ǐ6_+KUԔDmDVxTJh]6M ,DzlRVBu6ˑs0?OҒV27JTIhH2 +kyu/׳ȸ(L\p D\O|`co J \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f b/test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f new file mode 100644 index 000000000..088ac6af9 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/56/77dceabb2de40c648da3c831d037b429375131 b/test/integration/patchBuilding2/expected/.git_keep/objects/56/77dceabb2de40c648da3c831d037b429375131 deleted file mode 100644 index 7eb021d87..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/56/77dceabb2de40c648da3c831d037b429375131 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/80/8f2484733488c2b6bd2f3773b04437bbb20434 b/test/integration/patchBuilding2/expected/.git_keep/objects/80/8f2484733488c2b6bd2f3773b04437bbb20434 deleted file mode 100644 index 131931e6a..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/80/8f2484733488c2b6bd2f3773b04437bbb20434 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/8a/fc5e59aed0d570b89e1a658641c02b604ce71d b/test/integration/patchBuilding2/expected/.git_keep/objects/8a/fc5e59aed0d570b89e1a658641c02b604ce71d deleted file mode 100644 index f60db05cc..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/8a/fc5e59aed0d570b89e1a658641c02b604ce71d and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 b/test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 new file mode 100644 index 000000000..229d31f3d --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 @@ -0,0 +1,3 @@ +x +0 a}IfL*;16BeTзw?7fh+&j0E)DUys)_6'>_r;+Ñ1ute5 +?2~, \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 b/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 deleted file mode 100644 index 0ad5f47f2..000000000 --- a/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Ѯsʌ'))1P!")#tyS5[˥*`?4df 9PxKL}⧽qzm[ @B•ѝ4;eUr?4=, \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 b/test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 new file mode 100644 index 000000000..d7ecb6bbe Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 b/test/integration/patchBuilding2/expected/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 new file mode 100644 index 000000000..83b52a9fb Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 b/test/integration/patchBuilding2/expected/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 new file mode 100644 index 000000000..a8916d6ef Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master b/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master index ca13e5a27..c7758f16b 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master +++ b/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -808f2484733488c2b6bd2f3773b04437bbb20434 +e474bc2d1712ed5fdf14fb7223392f1b0dcc8d37 diff --git a/test/integration/patchBuilding2/expected/.git_keep/refs/stash b/test/integration/patchBuilding2/expected/.git_keep/refs/stash index 298dc200f..7ced0bdf5 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/refs/stash +++ b/test/integration/patchBuilding2/expected/.git_keep/refs/stash @@ -1 +1 @@ -06855901b0dbd8859a7ef5437380cef241f60187 +2c60d208ba3ec966b77ca756237843af7584cf93 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/index b/test/integration/patchBuildingWithFiletree/expected/.git_keep/index index a009f0e4c..8df960333 100644 Binary files a/test/integration/patchBuildingWithFiletree/expected/.git_keep/index and b/test/integration/patchBuildingWithFiletree/expected/.git_keep/index differ diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD index 94291433b..233b507f8 100644 --- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/HEAD @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 3260dd534b59a53e44813fc97bb49742fb971cdf CI 1617587025 +1000 commit (initial): first commit -3260dd534b59a53e44813fc97bb49742fb971cdf 4d0cf75a1ca408441015baf53e8c745f4157771c CI 1617587025 +1000 commit: blah -4d0cf75a1ca408441015baf53e8c745f4157771c 6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3 CI 1617587034 +1000 commit: asd +0000000000000000000000000000000000000000 c17dc7400fbb649385064c27544ba1e6c4751566 CI 1617671495 +1000 commit (initial): first commit +c17dc7400fbb649385064c27544ba1e6c4751566 b5e8fb99b011265d28065d0d545ff6b0245b1fa1 CI 1617671495 +1000 commit: blah +b5e8fb99b011265d28065d0d545ff6b0245b1fa1 88981dbb0664057b766113679127284f69f4fb69 CI 1617671504 +1000 commit: asd diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master index 94291433b..233b507f8 100644 --- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 3260dd534b59a53e44813fc97bb49742fb971cdf CI 1617587025 +1000 commit (initial): first commit -3260dd534b59a53e44813fc97bb49742fb971cdf 4d0cf75a1ca408441015baf53e8c745f4157771c CI 1617587025 +1000 commit: blah -4d0cf75a1ca408441015baf53e8c745f4157771c 6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3 CI 1617587034 +1000 commit: asd +0000000000000000000000000000000000000000 c17dc7400fbb649385064c27544ba1e6c4751566 CI 1617671495 +1000 commit (initial): first commit +c17dc7400fbb649385064c27544ba1e6c4751566 b5e8fb99b011265d28065d0d545ff6b0245b1fa1 CI 1617671495 +1000 commit: blah +b5e8fb99b011265d28065d0d545ff6b0245b1fa1 88981dbb0664057b766113679127284f69f4fb69 CI 1617671504 +1000 commit: asd diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf deleted file mode 100644 index ce5350a78..000000000 Binary files a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf and /dev/null differ diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c deleted file mode 100644 index 42fdd552d..000000000 --- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=Bqt1fF%؄`ǯG_^]CK?KsȄ"28[d$5C1:˻kgyD \1ESUѧEYԎdo ^_^oK9[ \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3 deleted file mode 100644 index 96f18c2ba..000000000 Binary files a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3 and /dev/null differ diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 new file mode 100644 index 000000000..da296aa57 Binary files /dev/null and b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 differ diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 new file mode 100644 index 000000000..f8deebc64 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 @@ -0,0 +1,4 @@ +xA +@ @Ѯ/D3 +R +uَ8Ƨl+3R zNU3~8 \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 new file mode 100644 index 000000000..ded22a0e1 Binary files /dev/null and b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 differ diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master b/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master index 5234ce06f..ad0c05c58 100644 --- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3 +88981dbb0664057b766113679127284f69f4fb69 diff --git a/test/integration/searching/expected/.git_keep/index b/test/integration/searching/expected/.git_keep/index index ea4b26c89..8c9f1df2b 100644 Binary files a/test/integration/searching/expected/.git_keep/index and b/test/integration/searching/expected/.git_keep/index differ diff --git a/test/integration/searching/expected/.git_keep/logs/HEAD b/test/integration/searching/expected/.git_keep/logs/HEAD index fb97c6bad..84a0ee396 100644 --- a/test/integration/searching/expected/.git_keep/logs/HEAD +++ b/test/integration/searching/expected/.git_keep/logs/HEAD @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 aa6ceb765f57224d1196d23b6ba65a767765a1c5 CI 1617587212 +1000 commit (initial): myfile1 -aa6ceb765f57224d1196d23b6ba65a767765a1c5 f1b38f1bd77ac351d397a83dd0ec1325e8622c01 CI 1617587212 +1000 commit: myfile2 -f1b38f1bd77ac351d397a83dd0ec1325e8622c01 e448ece7cf84d19a78095018a271731cdcc2bb1b CI 1617587212 +1000 commit: myfile3 -e448ece7cf84d19a78095018a271731cdcc2bb1b cbb8acda2ebe17a088fc1f89251bd4d9b0397580 CI 1617587212 +1000 commit: myfile4 -cbb8acda2ebe17a088fc1f89251bd4d9b0397580 fb01ecb35c6574bf41e689abec9afa337d22819e CI 1617587224 +1000 commit: asd +0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI 1617671505 +1000 commit (initial): myfile1 +f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 +6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 +5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 +fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/.git_keep/logs/refs/heads/master b/test/integration/searching/expected/.git_keep/logs/refs/heads/master index fb97c6bad..84a0ee396 100644 --- a/test/integration/searching/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/searching/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 aa6ceb765f57224d1196d23b6ba65a767765a1c5 CI 1617587212 +1000 commit (initial): myfile1 -aa6ceb765f57224d1196d23b6ba65a767765a1c5 f1b38f1bd77ac351d397a83dd0ec1325e8622c01 CI 1617587212 +1000 commit: myfile2 -f1b38f1bd77ac351d397a83dd0ec1325e8622c01 e448ece7cf84d19a78095018a271731cdcc2bb1b CI 1617587212 +1000 commit: myfile3 -e448ece7cf84d19a78095018a271731cdcc2bb1b cbb8acda2ebe17a088fc1f89251bd4d9b0397580 CI 1617587212 +1000 commit: myfile4 -cbb8acda2ebe17a088fc1f89251bd4d9b0397580 fb01ecb35c6574bf41e689abec9afa337d22819e CI 1617587224 +1000 commit: asd +0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI 1617671505 +1000 commit (initial): myfile1 +f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 +6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 +5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 +fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 b/test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 new file mode 100644 index 000000000..c20549cea Binary files /dev/null and b/test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 differ diff --git a/test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d b/test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d new file mode 100644 index 000000000..925e7d7e9 --- /dev/null +++ b/test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d @@ -0,0 +1,2 @@ +xM +0F] oDzdcK7GpxkmП!mxPwwRW'Sv`9 yu3 TFe@<[bc;Cmʅv!űa>1F ;Nu3W[ק8o: \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 b/test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 new file mode 100644 index 000000000..b83e266ba --- /dev/null +++ b/test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 @@ -0,0 +1,2 @@ +xM +0@a9L#?3Xhl)n╵wHap6XFQ3|%JQY6[Aѫj)gR+])RD0s%I\w'C>m\`֣EDsc˟ܴ΋d=;g \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/aa/6ceb765f57224d1196d23b6ba65a767765a1c5 b/test/integration/searching/expected/.git_keep/objects/aa/6ceb765f57224d1196d23b6ba65a767765a1c5 deleted file mode 100644 index 7afa7dbe9..000000000 --- a/test/integration/searching/expected/.git_keep/objects/aa/6ceb765f57224d1196d23b6ba65a767765a1c5 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9I#M&XR"~̖r*Jd7Y)J3_pMy.0Np~m^rPbLzLɝ}*1H, \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/cb/b8acda2ebe17a088fc1f89251bd4d9b0397580 b/test/integration/searching/expected/.git_keep/objects/cb/b8acda2ebe17a088fc1f89251bd4d9b0397580 deleted file mode 100644 index 0dc3ac718..000000000 Binary files a/test/integration/searching/expected/.git_keep/objects/cb/b8acda2ebe17a088fc1f89251bd4d9b0397580 and /dev/null differ diff --git a/test/integration/searching/expected/.git_keep/objects/e4/48ece7cf84d19a78095018a271731cdcc2bb1b b/test/integration/searching/expected/.git_keep/objects/e4/48ece7cf84d19a78095018a271731cdcc2bb1b deleted file mode 100644 index edd16047d..000000000 --- a/test/integration/searching/expected/.git_keep/objects/e4/48ece7cf84d19a78095018a271731cdcc2bb1b +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E)/LƘR -<8")ox{)k0tzX@DN=d:T qZN!*&7B1+8LT?sSn': \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/47/912ceb0ffa9b205290e75103d9dd6b1878e87b b/test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 similarity index 58% rename from test/integration/commit/expected/.git_keep/objects/47/912ceb0ffa9b205290e75103d9dd6b1878e87b rename to test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 index a92c77d4a..4d1e18b15 100644 --- a/test/integration/commit/expected/.git_keep/objects/47/912ceb0ffa9b205290e75103d9dd6b1878e87b +++ b/test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 @@ -1,2 +1,2 @@ xA -0@Q9I#M&XR"~̖r*Jd7Y)J4$gᚲ\zWa>NO$Vf #p&DtG=&]ξuY16, \ No newline at end of file +0@Q9I#M&XR"~̖r*Jd7Y)J4$gᚲ\zWa>NO$Vf 1617587272 +1000 commit (initial): myfile1 -1fb49389c3ca6720391e91714cff34f842b56328 d431809a4ded1399fbe0203a92eca627d40c873a CI 1617587284 +1000 commit: asd +0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 +70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master index 0da23f748..307e32726 100644 --- a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 1fb49389c3ca6720391e91714cff34f842b56328 CI 1617587272 +1000 commit (initial): myfile1 -1fb49389c3ca6720391e91714cff34f842b56328 d431809a4ded1399fbe0203a92eca627d40c873a CI 1617587284 +1000 commit: asd +0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 +70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/1f/b49389c3ca6720391e91714cff34f842b56328 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/1f/b49389c3ca6720391e91714cff34f842b56328 deleted file mode 100644 index 3a9806586..000000000 --- a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/1f/b49389c3ca6720391e91714cff34f842b56328 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9"BW=FL&XR"~̖SU!hzE2EfeS.0p~m^r;H2Daa8"rgߺJB3, \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 new file mode 100644 index 000000000..2a9fc4bd2 Binary files /dev/null and b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a new file mode 100644 index 000000000..bd6730a28 --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a @@ -0,0 +1,2 @@ +xA + @Ѯ= eFcBV9TG<պt .}WBNf[1EW^Q34czHVVG@p%D4g=']~˲*A, \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/d4/31809a4ded1399fbe0203a92eca627d40c873a b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/d4/31809a4ded1399fbe0203a92eca627d40c873a deleted file mode 100644 index 5f4a559f7..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/d4/31809a4ded1399fbe0203a92eca627d40c873a and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master index 77161f5b9..74947c528 100644 --- a/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -d431809a4ded1399fbe0203a92eca627d40c873a +364e6307f708c6f17d83c7309aaf9a3034210236 diff --git a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG index 877ad0ddb..3d0b7b54d 100644 --- a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG @@ -14,14 +14,14 @@ myfile3 # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# Date: Mon Apr 5 11:49:51 2021 +1000 +# Date: Tue Apr 6 11:12:11 2021 +1000 # -# interactive rebase in progress; onto e11ec0e +# interactive rebase in progress; onto a59b3d4 # Last commands done (4 commands done): -# drop 110df01 myfile4 -# fixup 07cf881 myfile5 +# drop 88fb48b myfile4 +# fixup a1cf779 myfile5 # No commands remaining. -# You are currently rebasing branch 'master' on 'e11ec0e'. +# You are currently rebasing branch 'master' on 'a59b3d4'. # # Changes to be committed: # new file: myfile2 diff --git a/test/integration/squash/expected/.git_keep/ORIG_HEAD b/test/integration/squash/expected/.git_keep/ORIG_HEAD index cbe313f37..2b380f442 100644 --- a/test/integration/squash/expected/.git_keep/ORIG_HEAD +++ b/test/integration/squash/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa +3c752371dc0c58af7ff63f7a6c252da9f4d96251 diff --git a/test/integration/squash/expected/.git_keep/index b/test/integration/squash/expected/.git_keep/index index d085b3efb..755c639e2 100644 Binary files a/test/integration/squash/expected/.git_keep/index and b/test/integration/squash/expected/.git_keep/index differ diff --git a/test/integration/squash/expected/.git_keep/logs/HEAD b/test/integration/squash/expected/.git_keep/logs/HEAD index f43c62dc8..295964da2 100644 --- a/test/integration/squash/expected/.git_keep/logs/HEAD +++ b/test/integration/squash/expected/.git_keep/logs/HEAD @@ -1,10 +1,10 @@ -0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587391 +1000 commit (initial): myfile1 -e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587391 +1000 commit: myfile2 -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI 1617587391 +1000 commit: myfile3 -20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI 1617587391 +1000 commit: myfile4 -110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI 1617587391 +1000 commit: myfile5 -07cf881fb6557a9676ff388420433cf375a3565e e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587392 +1000 rebase -i (start): checkout e11ec0e7a753a2cc10e348948173064e17d127d6 -e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587392 +1000 rebase -i: fast-forward -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 071c49e226b0040e0ecc3494417193357104914d CI 1617587395 +1000 rebase -i (squash): # This is a combination of 2 commits. -071c49e226b0040e0ecc3494417193357104914d 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (fixup): myfile2 -47e0e1f091e2be405f3e23e75eede4f6e392eda3 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (finish): returning to refs/heads/master +0000000000000000000000000000000000000000 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671531 +1000 commit (initial): myfile1 +a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671531 +1000 commit: myfile2 +3c752371dc0c58af7ff63f7a6c252da9f4d96251 9f83377e9068d956fe3085934bb32ce22aeb4bf7 CI 1617671531 +1000 commit: myfile3 +9f83377e9068d956fe3085934bb32ce22aeb4bf7 88fb48b35f6ece4da3ad62dd3426bca0240d63a5 CI 1617671531 +1000 commit: myfile4 +88fb48b35f6ece4da3ad62dd3426bca0240d63a5 a1cf7798606057d592f8ef1bee884165b6f629f1 CI 1617671531 +1000 commit: myfile5 +a1cf7798606057d592f8ef1bee884165b6f629f1 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671533 +1000 rebase -i (start): checkout a59b3d4800dcbf39ab31887402dc178e7b7f82a5 +a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671533 +1000 rebase -i: fast-forward +3c752371dc0c58af7ff63f7a6c252da9f4d96251 c59791a0d43d3e0a7ed0a40a62b7929acf675bf0 CI 1617671536 +1000 rebase -i (squash): # This is a combination of 2 commits. +c59791a0d43d3e0a7ed0a40a62b7929acf675bf0 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (fixup): myfile2 +075bd21694c75fd12e11cbd487eb64d831362e8c 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/squash/expected/.git_keep/logs/refs/heads/master b/test/integration/squash/expected/.git_keep/logs/refs/heads/master index ef591b30e..e7e0b635b 100644 --- a/test/integration/squash/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/squash/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587391 +1000 commit (initial): myfile1 -e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587391 +1000 commit: myfile2 -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI 1617587391 +1000 commit: myfile3 -20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI 1617587391 +1000 commit: myfile4 -110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI 1617587391 +1000 commit: myfile5 -07cf881fb6557a9676ff388420433cf375a3565e 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (finish): refs/heads/master onto e11ec0e7a753a2cc10e348948173064e17d127d6 +0000000000000000000000000000000000000000 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671531 +1000 commit (initial): myfile1 +a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671531 +1000 commit: myfile2 +3c752371dc0c58af7ff63f7a6c252da9f4d96251 9f83377e9068d956fe3085934bb32ce22aeb4bf7 CI 1617671531 +1000 commit: myfile3 +9f83377e9068d956fe3085934bb32ce22aeb4bf7 88fb48b35f6ece4da3ad62dd3426bca0240d63a5 CI 1617671531 +1000 commit: myfile4 +88fb48b35f6ece4da3ad62dd3426bca0240d63a5 a1cf7798606057d592f8ef1bee884165b6f629f1 CI 1617671531 +1000 commit: myfile5 +a1cf7798606057d592f8ef1bee884165b6f629f1 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (finish): refs/heads/master onto a59b3d4800dcbf39ab31887402dc178e7b7f82a5 diff --git a/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d b/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d deleted file mode 100644 index bf6740609..000000000 Binary files a/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d and /dev/null differ diff --git a/test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c b/test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c new file mode 100644 index 000000000..646d1891c Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c differ diff --git a/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e b/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e deleted file mode 100644 index 462faf5e8..000000000 Binary files a/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e and /dev/null differ diff --git a/test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3 b/test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3 deleted file mode 100644 index ca50ff20f..000000000 Binary files a/test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3 and /dev/null differ diff --git a/test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22 b/test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22 deleted file mode 100644 index aadb70531..000000000 Binary files a/test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22 and /dev/null differ diff --git a/test/integration/squash/expected/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 b/test/integration/squash/expected/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 new file mode 100644 index 000000000..72c11da74 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 differ diff --git a/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 b/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 deleted file mode 100644 index 7418a5b13..000000000 Binary files a/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 and /dev/null differ diff --git a/test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 b/test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 new file mode 100644 index 000000000..697df3951 Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 differ diff --git a/test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 b/test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 new file mode 100644 index 000000000..07a311e40 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 @@ -0,0 +1,3 @@ +xK +0@] W1,[J=xt C8]2rIP5 *T +q<ǃ,f]^"1CeDZfՄ)ҠG0udt)^B2D{91ܴ.OA*7: \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 b/test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 new file mode 100644 index 000000000..cb0e899e7 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 @@ -0,0 +1,2 @@ +xA +0@Q9d&icLR"~絵^wU +8b-ɱO։JipTuDI&:XDEHJ8 )ulK F0Np~m^0'3ZkQrӾu^ԛv; \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 b/test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 new file mode 100644 index 000000000..5bd43ffee --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 @@ -0,0 +1,2 @@ +xA +0@ѮsʌJ\yL")#tyS5[˥*`5df 9Px^%s^ui4=xz+!;9i'w+0, \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa b/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa deleted file mode 100644 index 7d8b69778..000000000 Binary files a/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa and /dev/null differ diff --git a/test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 b/test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 new file mode 100644 index 000000000..138c93f07 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 @@ -0,0 +1 @@ +xJ1 `}ifED}MvTз*E/? ܀PߵUGKM@x8"%&QW^eiS1D9;hZ' _\W8t~7.׋C-HV}ڟjn\yb>/r]&06 n+(m"G{1v3?i;`E \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 b/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 deleted file mode 100644 index bf8f83204..000000000 --- a/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Ѯsʌ\yL#tyS5[˥*`ŏ2RT 1617671537 +1000 commit (initial): file0 +1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 9d577efe8be29a993269a0a737ca9c8321a2adc2 CI 1617671537 +1000 commit: file1 diff --git a/test/integration/tags/expected/.git_keep/logs/refs/heads/master b/test/integration/tags/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..35076f038 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 CI 1617671537 +1000 commit (initial): file0 +1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 9d577efe8be29a993269a0a737ca9c8321a2adc2 CI 1617671537 +1000 commit: file1 diff --git a/test/integration/tags/expected/.git_keep/objects/1d/2a22db54ab37b582dc5e3c4ca660f06cdb4692 b/test/integration/tags/expected/.git_keep/objects/1d/2a22db54ab37b582dc5e3c4ca660f06cdb4692 new file mode 100644 index 000000000..a5426bded Binary files /dev/null and b/test/integration/tags/expected/.git_keep/objects/1d/2a22db54ab37b582dc5e3c4ca660f06cdb4692 differ diff --git a/test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/tags/expected/.git_keep/objects/9d/577efe8be29a993269a0a737ca9c8321a2adc2 b/test/integration/tags/expected/.git_keep/objects/9d/577efe8be29a993269a0a737ca9c8321a2adc2 new file mode 100644 index 000000000..882b0e797 Binary files /dev/null and b/test/integration/tags/expected/.git_keep/objects/9d/577efe8be29a993269a0a737ca9c8321a2adc2 differ diff --git a/test/integration/tags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/tags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/tags/expected/.git_keep/refs/heads/master b/test/integration/tags/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..027894ce8 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +9d577efe8be29a993269a0a737ca9c8321a2adc2 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag1 b/test/integration/tags/expected/.git_keep/refs/tags/tag1 new file mode 100644 index 000000000..027894ce8 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/tags/tag1 @@ -0,0 +1 @@ +9d577efe8be29a993269a0a737ca9c8321a2adc2 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag3 b/test/integration/tags/expected/.git_keep/refs/tags/tag3 new file mode 100644 index 000000000..027894ce8 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/tags/tag3 @@ -0,0 +1 @@ +9d577efe8be29a993269a0a737ca9c8321a2adc2 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag4 b/test/integration/tags/expected/.git_keep/refs/tags/tag4 new file mode 100644 index 000000000..3ee82d743 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/tags/tag4 @@ -0,0 +1 @@ +1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 diff --git a/test/integration/tags/expected/file0 b/test/integration/tags/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/tags/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/tags/expected/file1 b/test/integration/tags/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/tags/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/tags/recording.json b/test/integration/tags/recording.json new file mode 100644 index 000000000..06a606247 --- /dev/null +++ b/test/integration/tags/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":525,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1117,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1245,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1700,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1908,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1988,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2100,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2252,"Mod":0,"Key":256,"Ch":49},{"Timestamp":2486,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2796,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3324,"Mod":0,"Key":256,"Ch":116},{"Timestamp":3412,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3532,"Mod":0,"Key":256,"Ch":103},{"Timestamp":3860,"Mod":0,"Key":256,"Ch":50},{"Timestamp":4036,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4340,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4508,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4564,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4684,"Mod":0,"Key":256,"Ch":103},{"Timestamp":4908,"Mod":0,"Key":256,"Ch":51},{"Timestamp":5132,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5804,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5996,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6245,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6580,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6852,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7437,"Mod":0,"Key":256,"Ch":84},{"Timestamp":7749,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7820,"Mod":0,"Key":256,"Ch":97},{"Timestamp":7924,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8483,"Mod":0,"Key":256,"Ch":52},{"Timestamp":8805,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9357,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/tags/setup.sh b/test/integration/tags/setup.sh new file mode 100644 index 000000000..75cd7a91b --- /dev/null +++ b/test/integration/tags/setup.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 diff --git a/test/integration/tags/test.json b/test/integration/tags/test.json new file mode 100644 index 000000000..05914d80f --- /dev/null +++ b/test/integration/tags/test.json @@ -0,0 +1 @@ +{ "description": "basic CRUD for tags", "speed": 1 }