diff --git a/test/integration/diffing3/test.json b/test/integration/diffing3/test.json index e6156b2cf..8e427d1f4 100644 --- a/test/integration/diffing3/test.json +++ b/test/integration/diffing3/test.json @@ -1 +1 @@ -{ "description": "diffing two commits and making a patch from their diff files", "speed": 1 } +{ "description": "diffing two commits and making a patch from their diff files", "speed": 10 } diff --git a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG index 9daeafb98..c18cd76ce 100644 --- a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG @@ -1 +1 @@ -test +qas diff --git a/test/integration/rebaseReword/expected/.git_keep/index b/test/integration/rebaseReword/expected/.git_keep/index index a25ab61cc..f86f89839 100644 Binary files a/test/integration/rebaseReword/expected/.git_keep/index and b/test/integration/rebaseReword/expected/.git_keep/index differ diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD b/test/integration/rebaseReword/expected/.git_keep/logs/HEAD index fc84f04f9..d6b1c711e 100644 --- a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD +++ b/test/integration/rebaseReword/expected/.git_keep/logs/HEAD @@ -1,4 +1,4 @@ -0000000000000000000000000000000000000000 77a46efac3df6a531125dd83031978f4207fb0bf CI 1617674024 +1000 commit (initial): file0 -77a46efac3df6a531125dd83031978f4207fb0bf 1382f9e49487698170ca3356542ed94aff522d18 CI 1617674024 +1000 commit: file1 -1382f9e49487698170ca3356542ed94aff522d18 1719c3b9865f00407fbee59ee004104edc8bb62e CI 1617674024 +1000 commit: file2 -1719c3b9865f00407fbee59ee004104edc8bb62e 4a225f57a7e50ba304defb8db41d9736dd85613d CI 1617674028 +1000 commit (amend): test +0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI 1617683931 +1000 commit (initial): file0 +326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI 1617683931 +1000 commit: file1 +b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI 1617683931 +1000 commit: file2 +5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI 1617683936 +1000 commit (amend): qas diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master index fc84f04f9..d6b1c711e 100644 --- a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master @@ -1,4 +1,4 @@ -0000000000000000000000000000000000000000 77a46efac3df6a531125dd83031978f4207fb0bf CI 1617674024 +1000 commit (initial): file0 -77a46efac3df6a531125dd83031978f4207fb0bf 1382f9e49487698170ca3356542ed94aff522d18 CI 1617674024 +1000 commit: file1 -1382f9e49487698170ca3356542ed94aff522d18 1719c3b9865f00407fbee59ee004104edc8bb62e CI 1617674024 +1000 commit: file2 -1719c3b9865f00407fbee59ee004104edc8bb62e 4a225f57a7e50ba304defb8db41d9736dd85613d CI 1617674028 +1000 commit (amend): test +0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI 1617683931 +1000 commit (initial): file0 +326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI 1617683931 +1000 commit: file1 +b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI 1617683931 +1000 commit: file2 +5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI 1617683936 +1000 commit (amend): qas diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 b/test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 deleted file mode 100644 index 112af2af6..000000000 Binary files a/test/integration/rebaseReword/expected/.git_keep/objects/13/82f9e49487698170ca3356542ed94aff522d18 and /dev/null differ diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/17/19c3b9865f00407fbee59ee004104edc8bb62e b/test/integration/rebaseReword/expected/.git_keep/objects/17/19c3b9865f00407fbee59ee004104edc8bb62e deleted file mode 100644 index 6e9b065c8..000000000 --- a/test/integration/rebaseReword/expected/.git_keep/objects/17/19c3b9865f00407fbee59ee004104edc8bb62e +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] M@DH,4{쭭]CK?ubM-T k,To H DhE-$vQ ;\HOf}'s;6=4ΠW0ƨSĕ]9 \ No newline at end of file diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353 b/test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353 new file mode 100644 index 000000000..2d56ce435 --- /dev/null +++ b/test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353 @@ -0,0 +1,4 @@ +xA + @Ѯ= eF +YG9BiU uC|̤C*\Ц\( 5?i4u:y +~pפܔuS4?ܰ+ \ No newline at end of file diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d b/test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d deleted file mode 100644 index f44664ac8..000000000 --- a/test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d +++ /dev/null @@ -1,3 +0,0 @@ -xK -1] : "jIwP00FfmQxem5$8]D'!p!&d\@ R# ] -]#5KbHєlޡprV@*m44_SYECt58N?]uyu$9 \ No newline at end of file diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 b/test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 new file mode 100644 index 000000000..0571524c5 Binary files /dev/null and b/test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 differ diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf b/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf deleted file mode 100644 index bfcd244a3..000000000 --- a/test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf +++ /dev/null @@ -1,3 +0,0 @@ -xA -0Fa9cb@U4АR"x|{nպtK| -!$bharTi;i/mmnM;lǤ$7eYm+ \ No newline at end of file diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 b/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 new file mode 100644 index 000000000..d1a2e4efe Binary files /dev/null and b/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 differ diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d b/test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d new file mode 100644 index 000000000..ca6f646d3 Binary files /dev/null and b/test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d differ diff --git a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master index d123c9d33..ec7aaf6be 100644 --- a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master +++ b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -4a225f57a7e50ba304defb8db41d9736dd85613d +be0070df1dcd3839a2d908622817fee59d918d4d diff --git a/test/integration/rebaseReword/recording.json b/test/integration/rebaseReword/recording.json index 54095b121..5f3537e08 100644 --- a/test/integration/rebaseReword/recording.json +++ b/test/integration/rebaseReword/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":943,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1079,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1471,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1975,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2048,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2231,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2279,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2911,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3087,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3264,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3440,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3615,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3888,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4735,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":715,"Mod":0,"Key":259,"Ch":0},{"Timestamp":978,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2098,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2730,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2930,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3154,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3410,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3682,"Mod":0,"Key":271,"Ch":0},{"Timestamp":4306,"Mod":0,"Key":256,"Ch":113},{"Timestamp":4658,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4922,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5322,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6066,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/reflogCheckout/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCheckout/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogCheckout/expected/.git_keep/HEAD b/test/integration/reflogCheckout/expected/.git_keep/HEAD new file mode 100644 index 000000000..63e0b0bf0 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/ma diff --git a/test/integration/reflogCheckout/expected/.git_keep/config b/test/integration/reflogCheckout/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogCheckout/expected/.git_keep/description b/test/integration/reflogCheckout/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogCheckout/expected/.git_keep/index b/test/integration/reflogCheckout/expected/.git_keep/index new file mode 100644 index 000000000..6f3c8c471 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/index differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/info/exclude b/test/integration/reflogCheckout/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/HEAD b/test/integration/reflogCheckout/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..6fcc2f198 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI 1617683558 +1000 commit (initial): file0 +2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI 1617683558 +1000 commit: file1 +9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI 1617683558 +1000 commit: file2 +40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 commit: file4 +ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 checkout: moving from master to branch2 +ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683558 +1000 commit: file4 +fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI 1617683558 +1000 commit: file4 +37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI 1617683558 +1000 commit: file2 +10e005e1fa2db07721aa63cb048b87b7a2830b64 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683563 +1000 checkout: moving from branch2 to fdc461cdae46cbcd0e8b +fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683567 +1000 checkout: moving from fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 to ma diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..071cb8406 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 branch: Created from HEAD +ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683558 +1000 commit: file4 +fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI 1617683558 +1000 commit: file4 +37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI 1617683558 +1000 commit: file2 diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma new file mode 100644 index 000000000..4d6ce4df1 --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683567 +1000 branch: Created from fdc461c diff --git a/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..331bd0c7a --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI 1617683558 +1000 commit (initial): file0 +2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI 1617683558 +1000 commit: file1 +9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI 1617683558 +1000 commit: file2 +40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 commit: file4 diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCheckout/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 b/test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 new file mode 100644 index 000000000..1e1c0fb39 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 b/test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 new file mode 100644 index 000000000..7dc2d466c Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCheckout/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 b/test/integration/reflogCheckout/expected/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 new file mode 100644 index 000000000..e32ec0914 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCheckout/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 b/test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 new file mode 100644 index 000000000..2f6201ab7 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f b/test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f new file mode 100644 index 000000000..b310aa841 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCheckout/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 b/test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 new file mode 100644 index 000000000..b7e0a5cab --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 @@ -0,0 +1,2 @@ +xM +0@a9EL~&U1IfR"x|{o궮sn~X$b}KB%z!n#HPEfp0vqqzʗ}[ևuD99Ont^$: \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/reflogCheckout/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/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/reflogCheckout/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 b/test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 new file mode 100644 index 000000000..72227f67d --- /dev/null +++ b/test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 @@ -0,0 +1,2 @@ +xK +0FaYE file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/reflogCheckout/test.json b/test/integration/reflogCheckout/test.json new file mode 100644 index 000000000..40f23e49c --- /dev/null +++ b/test/integration/reflogCheckout/test.json @@ -0,0 +1 @@ +{ "description": "checking out a commit in the reflog context", "speed": 10 } diff --git a/test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCherryPick/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogCherryPick/expected/.git_keep/HEAD b/test/integration/reflogCherryPick/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD b/test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..9a97fa86f --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +afeb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/config b/test/integration/reflogCherryPick/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogCherryPick/expected/.git_keep/description b/test/integration/reflogCherryPick/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogCherryPick/expected/.git_keep/index b/test/integration/reflogCherryPick/expected/.git_keep/index new file mode 100644 index 000000000..913dfd580 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/index differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/info/exclude b/test/integration/reflogCherryPick/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD b/test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..a2378d782 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD @@ -0,0 +1,12 @@ +0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI 1617683609 +1000 commit (initial): file0 +5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI 1617683609 +1000 commit: file1 +713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI 1617683609 +1000 commit: file2 +e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 commit: file4 +afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 checkout: moving from master to branch2 +afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI 1617683609 +1000 commit: file4 +ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI 1617683609 +1000 commit: file4 +a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI 1617683609 +1000 commit: file2 +bc8891320172f4cfa3efd7bb8767a46daa200d79 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683610 +1000 checkout: moving from branch2 to master +afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683619 +1000 rebase -i (start): checkout HEAD +afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (pick): file2 +35bedc872b1ca9e026e51c4017416acba4b3d64b 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..fc6af3173 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 branch: Created from HEAD +afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI 1617683609 +1000 commit: file4 +ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI 1617683609 +1000 commit: file4 +a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI 1617683609 +1000 commit: file2 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..7d698f8ae --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI 1617683609 +1000 commit (initial): file0 +5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI 1617683609 +1000 commit: file1 +713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI 1617683609 +1000 commit: file2 +e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 commit: file4 +afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (finish): refs/heads/master onto afeb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCherryPick/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b b/test/integration/reflogCherryPick/expected/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b new file mode 100644 index 000000000..afcab4de2 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b @@ -0,0 +1,2 @@ +x}M +0@a9Ed&cN`m)<ݸu2w ZKj@2c$sNf]_JBbΠTr@":6uhx׏,S/u]n"}tl3G=OErK9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCherryPick/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCherryPick/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed b/test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed new file mode 100644 index 000000000..a8e70c668 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 b/test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 new file mode 100644 index 000000000..ed4c460f1 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 @@ -0,0 +1,2 @@ +xA +0@Q9IIDz`!Dn?j];f@69=Hdc*\Ч\+wi4mi $d۟ܕu3t?8+ \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 b/test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 new file mode 100644 index 000000000..254d31eaa --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 @@ -0,0 +1,2 @@ +xM +0F] Ϥ"BW=$`Dv֮쥟"9SΆ83ⰦB-N3ɣu)buS*S($!T/hS/c[CBɡ!}c I9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCherryPick/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 b/test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 new file mode 100644 index 000000000..f1acbc48f Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 b/test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 new file mode 100644 index 000000000..28711d3e7 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 @@ -0,0 +1,2 @@ +xK +0FaYEq./[Jo NZ[] br&"AAb }r^|5(RIYHL`OmF}'Ѧ}4E_1FyYA:! \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 b/test/integration/reflogCherryPick/expected/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 new file mode 100644 index 000000000..3861432eb Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 b/test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 new file mode 100644 index 000000000..97cea4509 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/reflogCherryPick/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/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd b/test/integration/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd new file mode 100644 index 000000000..557ada37e Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCherryPick/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/reflogCherryPick/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..bd45e4cdd --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +bc8891320172f4cfa3efd7bb8767a46daa200d79 diff --git a/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..255e95bd9 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +35bedc872b1ca9e026e51c4017416acba4b3d64b diff --git a/test/integration/reflogCherryPick/expected/file0 b/test/integration/reflogCherryPick/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/reflogCherryPick/expected/file1 b/test/integration/reflogCherryPick/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/reflogCherryPick/expected/file2 b/test/integration/reflogCherryPick/expected/file2 new file mode 100644 index 000000000..3baaa732b --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file2 @@ -0,0 +1,2 @@ +test2 +line two diff --git a/test/integration/reflogCherryPick/expected/file4 b/test/integration/reflogCherryPick/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/reflogCherryPick/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/reflogCherryPick/recording.json b/test/integration/reflogCherryPick/recording.json new file mode 100644 index 000000000..aa6a25783 --- /dev/null +++ b/test/integration/reflogCherryPick/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":574,"Mod":0,"Key":259,"Ch":0},{"Timestamp":829,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1029,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2773,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4325,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4933,"Mod":0,"Key":256,"Ch":93},{"Timestamp":6029,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7524,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8861,"Mod":0,"Key":256,"Ch":91},{"Timestamp":9613,"Mod":0,"Key":256,"Ch":118},{"Timestamp":9974,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10837,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogCherryPick/setup.sh b/test/integration/reflogCherryPick/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/reflogCherryPick/setup.sh @@ -0,0 +1,38 @@ +#!/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 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/reflogCherryPick/test.json b/test/integration/reflogCherryPick/test.json new file mode 100644 index 000000000..01c3dcbd4 --- /dev/null +++ b/test/integration/reflogCherryPick/test.json @@ -0,0 +1 @@ +{ "description": "cherry-picking a commit from the reflog context", "speed": 10 } diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..d72af3146 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +asd diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/FETCH_HEAD b/test/integration/reflogCommitFiles/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/HEAD b/test/integration/reflogCommitFiles/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/config b/test/integration/reflogCommitFiles/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/description b/test/integration/reflogCommitFiles/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/index b/test/integration/reflogCommitFiles/expected/.git_keep/index new file mode 100644 index 000000000..1f9535e1a Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/index differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/info/exclude b/test/integration/reflogCommitFiles/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/logs/HEAD b/test/integration/reflogCommitFiles/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..fc2f3142e --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 a6cc56fedc3f0fc234dcacef1f1de2706c32c44b CI 1617683727 +1000 commit (initial): file0 +a6cc56fedc3f0fc234dcacef1f1de2706c32c44b 7d61d1707885895d92f021111196df4466347327 CI 1617683727 +1000 commit: file1 +7d61d1707885895d92f021111196df4466347327 c54d82926c7b673499d675aec8732cfe08aed761 CI 1617683727 +1000 commit: file2 +c54d82926c7b673499d675aec8732cfe08aed761 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 commit: file4 +445557afd2775df735bc53b891678e6bd9072638 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 checkout: moving from master to branch2 +445557afd2775df735bc53b891678e6bd9072638 756e436bdd05b965c967edc1929432917e3864cd CI 1617683727 +1000 commit: file4 +756e436bdd05b965c967edc1929432917e3864cd 07e795700fa240713f5577867a45eb6f2071d856 CI 1617683727 +1000 commit: file4 +07e795700fa240713f5577867a45eb6f2071d856 5326459d9a0c196b18cc31dc95f05c9a4e4462de CI 1617683728 +1000 commit: file2 +5326459d9a0c196b18cc31dc95f05c9a4e4462de b0bf1c26d59a724c767948a6de15664bfc0c292f CI 1617683735 +1000 commit: asd diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..222df85dc --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 branch: Created from HEAD +445557afd2775df735bc53b891678e6bd9072638 756e436bdd05b965c967edc1929432917e3864cd CI 1617683727 +1000 commit: file4 +756e436bdd05b965c967edc1929432917e3864cd 07e795700fa240713f5577867a45eb6f2071d856 CI 1617683727 +1000 commit: file4 +07e795700fa240713f5577867a45eb6f2071d856 5326459d9a0c196b18cc31dc95f05c9a4e4462de CI 1617683728 +1000 commit: file2 +5326459d9a0c196b18cc31dc95f05c9a4e4462de b0bf1c26d59a724c767948a6de15664bfc0c292f CI 1617683735 +1000 commit: asd diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..2d7aeb3dd --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 a6cc56fedc3f0fc234dcacef1f1de2706c32c44b CI 1617683727 +1000 commit (initial): file0 +a6cc56fedc3f0fc234dcacef1f1de2706c32c44b 7d61d1707885895d92f021111196df4466347327 CI 1617683727 +1000 commit: file1 +7d61d1707885895d92f021111196df4466347327 c54d82926c7b673499d675aec8732cfe08aed761 CI 1617683727 +1000 commit: file2 +c54d82926c7b673499d675aec8732cfe08aed761 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 commit: file4 diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 new file mode 100644 index 000000000..d5890a188 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCommitFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCommitFiles/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 new file mode 100644 index 000000000..942c4cb98 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de b/test/integration/reflogCommitFiles/expected/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de new file mode 100644 index 000000000..44d19d016 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd b/test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd new file mode 100644 index 000000000..11a1c2730 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd @@ -0,0 +1,3 @@ +xK +0@]$L +"BW=$bDn+[kK7K?T!)lKX9QDB[eQJ!fCér"'} ȧ ԯ}[\tYe:k99O˪h~U9 \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 new file mode 100644 index 000000000..ce7286748 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b b/test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b new file mode 100644 index 000000000..61445855a Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b b/test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b new file mode 100644 index 000000000..d86c14ae8 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f b/test/integration/reflogCommitFiles/expected/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f new file mode 100644 index 000000000..18a6aebc7 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f @@ -0,0 +1,2 @@ +xM +0@a9Ed3@c2`l<=Ƿx;]a z0ɾ 5w4)/TƻMcLfv H*9-.I1jnَ|/Y€sT?w5?/95 \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 new file mode 100644 index 000000000..b1d3b6f0a --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 @@ -0,0 +1,3 @@ +xA +0E)/D3Rp1bfBSERkoп|<?o.BK;TmTDN2 2PB~Θ͞}5K@1{Xo1H|Gɤw{n';C?V™gOH +9sT?uSU|N8h \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/reflogCommitFiles/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/reflogCommitFiles/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCommitFiles/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/reflogCommitFiles/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..c47bc95c8 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +b0bf1c26d59a724c767948a6de15664bfc0c292f diff --git a/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..7cfd9a220 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +445557afd2775df735bc53b891678e6bd9072638 diff --git a/test/integration/reflogCommitFiles/expected/file0 b/test/integration/reflogCommitFiles/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/reflogCommitFiles/expected/file1 b/test/integration/reflogCommitFiles/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/reflogCommitFiles/expected/file2 b/test/integration/reflogCommitFiles/expected/file2 new file mode 100644 index 000000000..3baaa732b --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file2 @@ -0,0 +1,2 @@ +test2 +line two diff --git a/test/integration/reflogCommitFiles/expected/file4 b/test/integration/reflogCommitFiles/expected/file4 new file mode 100644 index 000000000..e5c5c5583 --- /dev/null +++ b/test/integration/reflogCommitFiles/expected/file4 @@ -0,0 +1,2 @@ +line one +line two diff --git a/test/integration/reflogCommitFiles/recording.json b/test/integration/reflogCommitFiles/recording.json new file mode 100644 index 000000000..bf91fbcf3 --- /dev/null +++ b/test/integration/reflogCommitFiles/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":608,"Mod":0,"Key":259,"Ch":0},{"Timestamp":768,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1376,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1817,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2560,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3271,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3936,"Mod":2,"Key":16,"Ch":16},{"Timestamp":4680,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4945,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5216,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5712,"Mod":0,"Key":260,"Ch":0},{"Timestamp":5952,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6191,"Mod":0,"Key":256,"Ch":99},{"Timestamp":6456,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6536,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6647,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6968,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7376,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/setup.sh b/test/integration/reflogCommitFiles/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/reflogCommitFiles/setup.sh @@ -0,0 +1,38 @@ +#!/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 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/reflogCommitFiles/test.json b/test/integration/reflogCommitFiles/test.json new file mode 100644 index 000000000..df7ad6e19 --- /dev/null +++ b/test/integration/reflogCommitFiles/test.json @@ -0,0 +1 @@ +{ "description": "Accessing commit files of a reflog entry", "speed": 10 } diff --git a/test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG b/test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/FETCH_HEAD b/test/integration/reflogHardReset/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/reflogHardReset/expected/.git_keep/HEAD b/test/integration/reflogHardReset/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD b/test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..000eb0200 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +1fd818af9eb65653e98def81168002cabc353b6a diff --git a/test/integration/reflogHardReset/expected/.git_keep/config b/test/integration/reflogHardReset/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/reflogHardReset/expected/.git_keep/description b/test/integration/reflogHardReset/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/reflogHardReset/expected/.git_keep/index b/test/integration/reflogHardReset/expected/.git_keep/index new file mode 100644 index 000000000..fcbfa4ccf Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/index differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/info/exclude b/test/integration/reflogHardReset/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/reflogHardReset/expected/.git_keep/logs/HEAD b/test/integration/reflogHardReset/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..4b553fd32 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 496408d5ed7b1edff760bf2ce56a43b9fab737e0 CI 1617683684 +1000 commit (initial): file0 +496408d5ed7b1edff760bf2ce56a43b9fab737e0 940576e482f2193afad72ea2205c05fd01507e1a CI 1617683684 +1000 commit: file1 +940576e482f2193afad72ea2205c05fd01507e1a 1883828474eb5bac8cb27c8a7a3614f9ea3137a0 CI 1617683684 +1000 commit: file2 +1883828474eb5bac8cb27c8a7a3614f9ea3137a0 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 commit: file4 +16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 checkout: moving from master to branch2 +16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683684 +1000 commit: file4 +3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 7c03a659737f2cc728a2a572cedee98019bbd04b CI 1617683684 +1000 commit: file4 +7c03a659737f2cc728a2a572cedee98019bbd04b 1fd818af9eb65653e98def81168002cabc353b6a CI 1617683684 +1000 commit: file2 +1fd818af9eb65653e98def81168002cabc353b6a 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683689 +1000 reset: moving to 3e0b28f0bcdd445c5f6d diff --git a/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..558ce9a6b --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 branch: Created from HEAD +16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683684 +1000 commit: file4 +3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 7c03a659737f2cc728a2a572cedee98019bbd04b CI 1617683684 +1000 commit: file4 +7c03a659737f2cc728a2a572cedee98019bbd04b 1fd818af9eb65653e98def81168002cabc353b6a CI 1617683684 +1000 commit: file2 +1fd818af9eb65653e98def81168002cabc353b6a 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683689 +1000 reset: moving to 3e0b28f0bcdd445c5f6d diff --git a/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..11f14b24e --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 496408d5ed7b1edff760bf2ce56a43b9fab737e0 CI 1617683684 +1000 commit (initial): file0 +496408d5ed7b1edff760bf2ce56a43b9fab737e0 940576e482f2193afad72ea2205c05fd01507e1a CI 1617683684 +1000 commit: file1 +940576e482f2193afad72ea2205c05fd01507e1a 1883828474eb5bac8cb27c8a7a3614f9ea3137a0 CI 1617683684 +1000 commit: file2 +1883828474eb5bac8cb27c8a7a3614f9ea3137a0 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 commit: file4 diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogHardReset/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 b/test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 new file mode 100644 index 000000000..a6ae1480f --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 @@ -0,0 +1,2 @@ +xK +0@] LU1'Xhl)<9{xomfw駈pF ܓ},@ DաQ!G7 %b‑|f!o=Qyyȗڱɍv6YH}5IP?oK9x \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogHardReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 b/test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 new file mode 100644 index 000000000..471870fd2 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 @@ -0,0 +1,2 @@ +xA +0E] 23i ]dƖ#ium#]کj2K83LR=`Vd&$JS|gS!N@*D=E1ilԯc[Fjnʺ)H9 \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogHardReset/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a b/test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a new file mode 100644 index 000000000..c4caad22e Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogHardReset/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogHardReset/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 b/test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 new file mode 100644 index 000000000..a98e469b9 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 b/test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 new file mode 100644 index 000000000..7d29a0959 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b b/test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b new file mode 100644 index 000000000..75304b52b Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogHardReset/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a b/test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a new file mode 100644 index 000000000..65f78d291 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a @@ -0,0 +1,4 @@ +xM +0@a9tҀU1LR"x|{odkm`C +FI"X]TDNC-^G +)PfCBcl suq9UGEßfOSUoXFOcEDsseUk~n:` \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogHardReset/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogHardReset/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/reflogHardReset/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/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/reflogHardReset/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..9a9e37446 --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 diff --git a/test/integration/reflogHardReset/expected/.git_keep/refs/heads/master b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..ebc65e0dd --- /dev/null +++ b/test/integration/reflogHardReset/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 diff --git a/test/integration/reflogHardReset/expected/file0 b/test/integration/reflogHardReset/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/reflogHardReset/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/reflogHardReset/expected/file1 b/test/integration/reflogHardReset/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/reflogHardReset/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/reflogHardReset/expected/file2 b/test/integration/reflogHardReset/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/reflogHardReset/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/reflogHardReset/expected/file4 b/test/integration/reflogHardReset/expected/file4 new file mode 100644 index 000000000..e5c5c5583 --- /dev/null +++ b/test/integration/reflogHardReset/expected/file4 @@ -0,0 +1,2 @@ +line one +line two diff --git a/test/integration/reflogHardReset/recording.json b/test/integration/reflogHardReset/recording.json new file mode 100644 index 000000000..d0ea679cd --- /dev/null +++ b/test/integration/reflogHardReset/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1017,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1296,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1857,"Mod":0,"Key":256,"Ch":93},{"Timestamp":2360,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2680,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3928,"Mod":0,"Key":256,"Ch":103},{"Timestamp":4296,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4448,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4752,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5656,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogHardReset/setup.sh b/test/integration/reflogHardReset/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/reflogHardReset/setup.sh @@ -0,0 +1,38 @@ +#!/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 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/reflogHardReset/test.json b/test/integration/reflogHardReset/test.json new file mode 100644 index 000000000..84304a953 --- /dev/null +++ b/test/integration/reflogHardReset/test.json @@ -0,0 +1 @@ +{ "description": "Hard resetting to commit in the reflog", "speed": 10 } diff --git a/test/integration/undo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/undo/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..2e97e3406 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,24 @@ +# This is a combination of 2 commits. +# This is the 1st commit message: + +file4 + +# This is the commit message #2: + +file4 + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Date: Tue Apr 6 14:29:30 2021 +1000 +# +# interactive rebase in progress; onto 68ac4e4 +# Last commands done (2 commands done): +# pick fcf4651 file4 +# squash 9d187b7 file4 +# No commands remaining. +# You are currently rebasing branch 'branch2' on '68ac4e4'. +# +# Changes to be committed: +# new file: file4 +# diff --git a/test/integration/undo/expected/.git_keep/FETCH_HEAD b/test/integration/undo/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/undo/expected/.git_keep/HEAD b/test/integration/undo/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/undo/expected/.git_keep/ORIG_HEAD b/test/integration/undo/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..ed9815e19 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +7ce8eac65e3ae50cb50a570dc775b745464f3a3e diff --git a/test/integration/undo/expected/.git_keep/config b/test/integration/undo/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/undo/expected/.git_keep/description b/test/integration/undo/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/undo/expected/.git_keep/index b/test/integration/undo/expected/.git_keep/index new file mode 100644 index 000000000..f347af7db Binary files /dev/null and b/test/integration/undo/expected/.git_keep/index differ diff --git a/test/integration/undo/expected/.git_keep/info/exclude b/test/integration/undo/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/undo/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/undo/expected/.git_keep/logs/HEAD b/test/integration/undo/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..faf40ba78 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/logs/HEAD @@ -0,0 +1,20 @@ +0000000000000000000000000000000000000000 6d95d7a7842625152ba887482879dfdaf247f591 CI 1617683370 +1000 commit (initial): file0 +6d95d7a7842625152ba887482879dfdaf247f591 4f77a25a15ccca0273baa522f7281727f31ceeb8 CI 1617683370 +1000 commit: file1 +4f77a25a15ccca0273baa522f7281727f31ceeb8 68ac4e416c01408d37c59465852aa1856a4abdb1 CI 1617683370 +1000 commit: file2 +68ac4e416c01408d37c59465852aa1856a4abdb1 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 commit: file4 +fcf46511d7819220e0cc310ae6d891fadfdb79aa fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 checkout: moving from master to branch2 +fcf46511d7819220e0cc310ae6d891fadfdb79aa 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683370 +1000 commit: file4 +5d2b236ff0e8342ef1e531506f6f99070d53cf25 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683370 +1000 commit: file4 +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683370 +1000 commit: file2 +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (start): checkout 3e4f2b1aeb076cff592279f94b1f495442690521 +3e4f2b1aeb076cff592279f94b1f495442690521 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (finish): returning to refs/heads/branch2 +3e4f2b1aeb076cff592279f94b1f495442690521 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683373 +1000 rebase -i (start): checkout fcf46511d7819220e0cc310ae6d891fadfdb79aa +5d2b236ff0e8342ef1e531506f6f99070d53cf25 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (fixup): file4 +9d187b7f4819a69996dd27e3d66a5224e05d9f41 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (finish): returning to refs/heads/branch2 +9d187b7f4819a69996dd27e3d66a5224e05d9f41 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683374 +1000 rebase -i (start): checkout 68ac4e416c01408d37c59465852aa1856a4abdb1 +fcf46511d7819220e0cc310ae6d891fadfdb79aa 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (squash): file4 +9936b8f380c2937bb457ade468bfc7dc850293f9 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (finish): returning to refs/heads/branch2 +9936b8f380c2937bb457ade468bfc7dc850293f9 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683376 +1000 [lazygit undo]: updating HEAD +9d187b7f4819a69996dd27e3d66a5224e05d9f41 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683377 +1000 [lazygit undo]: updating HEAD +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683377 +1000 [lazygit undo]: updating HEAD +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683379 +1000 [lazygit redo]: updating HEAD diff --git a/test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..7b49f493a --- /dev/null +++ b/test/integration/undo/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,11 @@ +0000000000000000000000000000000000000000 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 branch: Created from HEAD +fcf46511d7819220e0cc310ae6d891fadfdb79aa 5d2b236ff0e8342ef1e531506f6f99070d53cf25 CI 1617683370 +1000 commit: file4 +5d2b236ff0e8342ef1e531506f6f99070d53cf25 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683370 +1000 commit: file4 +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683370 +1000 commit: file2 +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683372 +1000 rebase -i (finish): refs/heads/branch2 onto 3e4f2b1aeb076cff592279f94b1f495442690521 +3e4f2b1aeb076cff592279f94b1f495442690521 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683373 +1000 rebase -i (finish): refs/heads/branch2 onto fcf46511d7819220e0cc310ae6d891fadfdb79aa +9d187b7f4819a69996dd27e3d66a5224e05d9f41 9936b8f380c2937bb457ade468bfc7dc850293f9 CI 1617683374 +1000 rebase -i (finish): refs/heads/branch2 onto 68ac4e416c01408d37c59465852aa1856a4abdb1 +9936b8f380c2937bb457ade468bfc7dc850293f9 9d187b7f4819a69996dd27e3d66a5224e05d9f41 CI 1617683376 +1000 [lazygit undo]: updating HEAD +9d187b7f4819a69996dd27e3d66a5224e05d9f41 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683377 +1000 [lazygit undo]: updating HEAD +3e4f2b1aeb076cff592279f94b1f495442690521 7ce8eac65e3ae50cb50a570dc775b745464f3a3e CI 1617683377 +1000 [lazygit undo]: updating HEAD +7ce8eac65e3ae50cb50a570dc775b745464f3a3e 3e4f2b1aeb076cff592279f94b1f495442690521 CI 1617683379 +1000 [lazygit redo]: updating HEAD diff --git a/test/integration/undo/expected/.git_keep/logs/refs/heads/master b/test/integration/undo/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..e973b2106 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 6d95d7a7842625152ba887482879dfdaf247f591 CI 1617683370 +1000 commit (initial): file0 +6d95d7a7842625152ba887482879dfdaf247f591 4f77a25a15ccca0273baa522f7281727f31ceeb8 CI 1617683370 +1000 commit: file1 +4f77a25a15ccca0273baa522f7281727f31ceeb8 68ac4e416c01408d37c59465852aa1856a4abdb1 CI 1617683370 +1000 commit: file2 +68ac4e416c01408d37c59465852aa1856a4abdb1 fcf46511d7819220e0cc310ae6d891fadfdb79aa CI 1617683370 +1000 commit: file4 diff --git a/test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/undo/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/undo/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/undo/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/undo/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 b/test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 new file mode 100644 index 000000000..171f5e1db Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/3e/4f2b1aeb076cff592279f94b1f495442690521 differ diff --git a/test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 b/test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 new file mode 100644 index 000000000..03e728678 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/objects/4f/77a25a15ccca0273baa522f7281727f31ceeb8 @@ -0,0 +1,2 @@ +xA + @Ѯ=BqFQ(U1& =~sn?ou[׹[xG8&լ겨OmR[0- "NsiEn1OmF{gʺ/@gg3g=z6/] 9 \ No newline at end of file diff --git a/test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 b/test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 new file mode 100644 index 000000000..a5b4f0d4e Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/5d/2b236ff0e8342ef1e531506f6f99070d53cf25 differ diff --git a/test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 b/test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 new file mode 100644 index 000000000..f1bf22f4d Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/68/ac4e416c01408d37c59465852aa1856a4abdb1 differ diff --git a/test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 b/test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 new file mode 100644 index 000000000..5dd318b97 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/6d/95d7a7842625152ba887482879dfdaf247f591 differ diff --git a/test/integration/undo/expected/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e b/test/integration/undo/expected/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e new file mode 100644 index 000000000..f91d93c71 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/7c/e8eac65e3ae50cb50a570dc775b745464f3a3e differ diff --git a/test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 b/test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 new file mode 100644 index 000000000..aeb252f85 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/99/36b8f380c2937bb457ade468bfc7dc850293f9 differ diff --git a/test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 b/test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 new file mode 100644 index 000000000..e1d183bb8 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/9d/187b7f4819a69996dd27e3d66a5224e05d9f41 differ diff --git a/test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/undo/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/undo/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/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/undo/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa b/test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa new file mode 100644 index 000000000..35d0eab8b --- /dev/null +++ b/test/integration/undo/expected/.git_keep/objects/fc/f46511d7819220e0cc310ae6d891fadfdb79aa @@ -0,0 +1,3 @@ +xA + @Ѯ=BqtJ)dc & =~sn?oekmCNa~kJp>ij'gv>m"T$Ă)R@11r*vaa|۾M ' +!;{99OneU4?O9- \ No newline at end of file diff --git a/test/integration/undo/expected/.git_keep/refs/heads/branch2 b/test/integration/undo/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..f152723fe --- /dev/null +++ b/test/integration/undo/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +3e4f2b1aeb076cff592279f94b1f495442690521 diff --git a/test/integration/undo/expected/.git_keep/refs/heads/master b/test/integration/undo/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..c4d4b22b4 --- /dev/null +++ b/test/integration/undo/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +fcf46511d7819220e0cc310ae6d891fadfdb79aa diff --git a/test/integration/undo/expected/file0 b/test/integration/undo/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/undo/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/undo/expected/file1 b/test/integration/undo/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/undo/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/undo/expected/file2 b/test/integration/undo/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/undo/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/undo/expected/file4 b/test/integration/undo/expected/file4 new file mode 100644 index 000000000..0c2aa38e0 --- /dev/null +++ b/test/integration/undo/expected/file4 @@ -0,0 +1,3 @@ +line one +line two +line three diff --git a/test/integration/undo/recording.json b/test/integration/undo/recording.json new file mode 100644 index 000000000..3c4161386 --- /dev/null +++ b/test/integration/undo/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":627,"Mod":0,"Key":259,"Ch":0},{"Timestamp":979,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1443,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1723,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2411,"Mod":0,"Key":256,"Ch":102},{"Timestamp":2811,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3515,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3994,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5490,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6490,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7387,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8428,"Mod":2,"Key":26,"Ch":26},{"Timestamp":9234,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/undo/setup.sh b/test/integration/undo/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/undo/setup.sh @@ -0,0 +1,38 @@ +#!/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 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/undo/test.json b/test/integration/undo/test.json new file mode 100644 index 000000000..2fe536d46 --- /dev/null +++ b/test/integration/undo/test.json @@ -0,0 +1 @@ +{ "description": "undoing some changes to commits", "speed": 10 } diff --git a/test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file2 diff --git a/test/integration/undo2/expected/.git_keep/FETCH_HEAD b/test/integration/undo2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/undo2/expected/.git_keep/HEAD b/test/integration/undo2/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/undo2/expected/.git_keep/ORIG_HEAD b/test/integration/undo2/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..064ef4565 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +481ce2cf9d037b83acb1d452973695764bf7b95e diff --git a/test/integration/undo2/expected/.git_keep/config b/test/integration/undo2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/undo2/expected/.git_keep/description b/test/integration/undo2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/undo2/expected/.git_keep/index b/test/integration/undo2/expected/.git_keep/index new file mode 100644 index 000000000..0385f0c7e Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/index differ diff --git a/test/integration/undo2/expected/.git_keep/info/exclude b/test/integration/undo2/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/undo2/expected/.git_keep/logs/HEAD b/test/integration/undo2/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..dfd7e1862 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/logs/HEAD @@ -0,0 +1,28 @@ +0000000000000000000000000000000000000000 8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 CI 1617683460 +1000 commit (initial): file0 +8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 +a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 checkout: moving from master to branch2 +a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 +df1876c035ade1ba199afadd399a6d4273190cd8 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683461 +1000 checkout: moving from branch2 to master +a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (start): checkout bce6c0c795a3d37c0a2c382a6d9c146b1889f86c +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): returning to refs/heads/master +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (start): checkout 0e2680a41392859e5159716b50525850017c6a59 +0e2680a41392859e5159716b50525850017c6a59 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): returning to refs/heads/master +0e2680a41392859e5159716b50525850017c6a59 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683464 +1000 checkout: moving from master to branch2 +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (start): checkout e51d8e24ead991fdd7fd9b9d90924c2e24576981 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): returning to refs/heads/branch2 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (start): checkout 481ce2cf9d037b83acb1d452973695764bf7b95e +481ce2cf9d037b83acb1d452973695764bf7b95e 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): returning to refs/heads/branch2 +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD +df1876c035ade1ba199afadd399a6d4273190cd8 0e2680a41392859e5159716b50525850017c6a59 CI 1617683467 +1000 [lazygit undo] +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD +a3bf51bf610771f997de1d3f313ab7c43e20bef5 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683469 +1000 [lazygit undo] +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD +481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD +a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo] diff --git a/test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..692281b19 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,11 @@ +0000000000000000000000000000000000000000 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 branch: Created from HEAD +a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): refs/heads/branch2 onto e51d8e24ead991fdd7fd9b9d90924c2e24576981 +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): refs/heads/branch2 onto 481ce2cf9d037b83acb1d452973695764bf7b95e +481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD +df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD +e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD +481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/.git_keep/logs/refs/heads/master b/test/integration/undo2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..805835942 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,8 @@ +0000000000000000000000000000000000000000 8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 CI 1617683460 +1000 commit (initial): file0 +8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 +a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): refs/heads/master onto bce6c0c795a3d37c0a2c382a6d9c146b1889f86c +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): refs/heads/master onto 0e2680a41392859e5159716b50525850017c6a59 +0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD +bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 000000000..38acaeff2 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 b/test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 new file mode 100644 index 000000000..dab8fd41a --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 @@ -0,0 +1,2 @@ +x; +0 @; EGBCeH\#ty Ou.P(,̮zj$.U(wzdѓ88&!$𧿶Sd[ egnڼ(9 \ No newline at end of file diff --git a/test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 000000000..d4270c258 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/undo2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 000000000..65140e8b7 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a differ diff --git a/test/integration/undo2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/undo2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b new file mode 100644 index 000000000..e0473aaf4 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b differ diff --git a/test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e b/test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e new file mode 100644 index 000000000..a4ba62ac1 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e @@ -0,0 +1,2 @@ +xA + @Ѯ=BqIBV9ƨ# & =~sn?o-U; r x@Y4 Dr[T#B$q`_aާ_iň'7uY՛n: \ No newline at end of file diff --git a/test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 000000000..ed5045497 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 b/test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 new file mode 100644 index 000000000..e5028f911 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 000000000..2920ab335 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 b/test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 new file mode 100644 index 000000000..751b9844f Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/undo2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c b/test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c new file mode 100644 index 000000000..bc5e863f8 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c differ diff --git a/test/integration/undo2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/undo2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/undo2/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/undo2/expected/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 b/test/integration/undo2/expected/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 new file mode 100644 index 000000000..53e3c7aaa Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 b/test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 new file mode 100644 index 000000000..d784921aa Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 000000000..01ce23cee Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 differ diff --git a/test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 000000000..08edf28f3 Binary files /dev/null and b/test/integration/undo2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a differ diff --git a/test/integration/undo2/expected/.git_keep/refs/heads/branch2 b/test/integration/undo2/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..fe4f6f367 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/.git_keep/refs/heads/master b/test/integration/undo2/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..fe4f6f367 --- /dev/null +++ b/test/integration/undo2/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/file0 b/test/integration/undo2/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/undo2/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/undo2/expected/file1 b/test/integration/undo2/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/undo2/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/undo2/expected/file2 b/test/integration/undo2/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/undo2/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/undo2/expected/file4 b/test/integration/undo2/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/undo2/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/undo2/recording.json b/test/integration/undo2/recording.json new file mode 100644 index 000000000..c9398dfa5 --- /dev/null +++ b/test/integration/undo2/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":647,"Mod":0,"Key":259,"Ch":0},{"Timestamp":917,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1245,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1646,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1957,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2205,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2533,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2765,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3141,"Mod":0,"Key":260,"Ch":0},{"Timestamp":3397,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3637,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3933,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4780,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5205,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5405,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5685,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5877,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6277,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6725,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7317,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7845,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8372,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8885,"Mod":0,"Key":256,"Ch":122},{"Timestamp":9469,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10069,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10645,"Mod":0,"Key":256,"Ch":122},{"Timestamp":11189,"Mod":0,"Key":256,"Ch":122},{"Timestamp":12077,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/undo2/setup.sh b/test/integration/undo2/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/undo2/setup.sh @@ -0,0 +1,38 @@ +#!/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 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/undo2/test.json b/test/integration/undo2/test.json new file mode 100644 index 000000000..ade09ab38 --- /dev/null +++ b/test/integration/undo2/test.json @@ -0,0 +1 @@ +{ "description": "undoing changes in both commits and branches", "speed": 10 }