more tests

test/integration/rebaseSwapping/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1,15 @@
+file4-changed
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# interactive rebase in progress; onto 613c1bf
+# Last commands done (2 commands done):
+#    pick 0e45fe2 file4-changed-again
+#    pick ceada38 file4-changed
+# No commands remaining.
+# You are currently rebasing branch 'master' on '613c1bf'.
+#
+# Changes to be committed:
+#	modified:   file4
+#

test/integration/rebaseSwapping/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

test/integration/rebaseSwapping/expected/.git_keep/ORIG_HEAD

@@ -0,0 +1 @@
+ceada384bff8df54abb8acbf497b751aa9220f00

test/integration/rebaseSwapping/expected/.git_keep/REBASE_HEAD

@@ -0,0 +1 @@
+ceada384bff8df54abb8acbf497b751aa9220f00

test/integration/rebaseSwapping/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

test/integration/rebaseSwapping/expected/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/rebaseSwapping/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

test/integration/rebaseSwapping/expected/.git_keep/logs/HEAD

@@ -0,0 +1,10 @@
+0000000000000000000000000000000000000000 ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 CI <CI@example.com> 1617673516 +1000	commit (initial): file0
+ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b218d34eec545f29156411f24ab609b970082e1c CI <CI@example.com> 1617673516 +1000	commit: file1
+b218d34eec545f29156411f24ab609b970082e1c d23bcf26566cbf601e766d12ea206cb7827d6630 CI <CI@example.com> 1617673516 +1000	commit: file2
+d23bcf26566cbf601e766d12ea206cb7827d6630 613c1bfa180babe5e67317d1ef42d566718a7d8f CI <CI@example.com> 1617673516 +1000	commit: file4-added
+613c1bfa180babe5e67317d1ef42d566718a7d8f ceada384bff8df54abb8acbf497b751aa9220f00 CI <CI@example.com> 1617673516 +1000	commit: file4-changed
+ceada384bff8df54abb8acbf497b751aa9220f00 0e45fe2fb8b21adfe348ec5419bd87e4c796c02a CI <CI@example.com> 1617673516 +1000	commit: file4-changed-again
+0e45fe2fb8b21adfe348ec5419bd87e4c796c02a 613c1bfa180babe5e67317d1ef42d566718a7d8f CI <CI@example.com> 1617673517 +1000	rebase -i (start): checkout 613c1bfa180babe5e67317d1ef42d566718a7d8f
+613c1bfa180babe5e67317d1ef42d566718a7d8f 84c7a918e6bd704aaf4f789ecaea479ab31d4741 CI <CI@example.com> 1617673520 +1000	rebase -i (continue): file4-changed-again
+84c7a918e6bd704aaf4f789ecaea479ab31d4741 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI <CI@example.com> 1617673523 +1000	rebase -i (continue): file4-changed
+41eefd8a741d391640c4e0528e0b6fff31f90a18 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI <CI@example.com> 1617673523 +1000	rebase -i (finish): returning to refs/heads/master

test/integration/rebaseSwapping/expected/.git_keep/logs/refs/heads/master

@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 CI <CI@example.com> 1617673516 +1000	commit (initial): file0
+ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b218d34eec545f29156411f24ab609b970082e1c CI <CI@example.com> 1617673516 +1000	commit: file1
+b218d34eec545f29156411f24ab609b970082e1c d23bcf26566cbf601e766d12ea206cb7827d6630 CI <CI@example.com> 1617673516 +1000	commit: file2
+d23bcf26566cbf601e766d12ea206cb7827d6630 613c1bfa180babe5e67317d1ef42d566718a7d8f CI <CI@example.com> 1617673516 +1000	commit: file4-added
+613c1bfa180babe5e67317d1ef42d566718a7d8f ceada384bff8df54abb8acbf497b751aa9220f00 CI <CI@example.com> 1617673516 +1000	commit: file4-changed
+ceada384bff8df54abb8acbf497b751aa9220f00 0e45fe2fb8b21adfe348ec5419bd87e4c796c02a CI <CI@example.com> 1617673516 +1000	commit: file4-changed-again
+0e45fe2fb8b21adfe348ec5419bd87e4c796c02a 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI <CI@example.com> 1617673523 +1000	rebase -i (finish): refs/heads/master onto 613c1bfa180babe5e67317d1ef42d566718a7d8f

test/integration/rebaseSwapping/expected/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a

@@ -0,0 +1,2 @@
+x
��M
+�0@��s���%����+�1IfT0*�B�_����[��׺4�����H2N^䬹�#P�6e0:9��%G@Zx��d&,h�M̱���RĜ��!��֊��i�~�a��a|����#��%�C��8����W����/+�.ϸMT:�p���@{

test/integration/rebaseSwapping/expected/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c

@@ -0,0 +1,4 @@
+x
��A
+�0@Q�9E��d:��
��c2�`��R"x|{�������ti8��̗���TC
+R�ʒ�Z�S�n���݋␑2���I
+V�R3�U�M��D��O���f���}�m/�����G ��;�1��O���2p?�:B

test/integration/rebaseSwapping/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -0,0 +1,2 @@
+x
+)JMU03c040031QH��I5`������ֶw���w.��h�T�[H
+��y�W5�Ɨ��(�|�
^-�W
(x9

test/integration/rebaseSwapping/expected/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+41eefd8a741d391640c4e0528e0b6fff31f90a18

test/integration/rebaseSwapping/expected/file0

@@ -0,0 +1 @@
+test0

test/integration/rebaseSwapping/expected/file1

@@ -0,0 +1 @@
+test1

test/integration/rebaseSwapping/expected/file2

@@ -0,0 +1 @@
+test2

test/integration/rebaseSwapping/expected/file4

@@ -0,0 +1 @@
+test4

test/integration/rebaseSwapping/recording.json

@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":759,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1102,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1711,"Mod":2,"Key":10,"Ch":10},{"Timestamp":2455,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2943,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3335,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3838,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4390,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5110,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5695,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6207,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6742,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7695,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/rebaseSwapping/setup.sh

@@ -0,0 +1,32 @@
+#!/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 test3 > file4
+git add .
+git commit -am file4-added
+
+echo test4 > file4
+git add .
+git commit -am file4-changed
+
+echo test5 > file4
+git add .
+git commit -am file4-changed-again

test/integration/rebaseSwapping/test.json

@@ -0,0 +1 @@
+{ "description": "Directly swapping two commits, then resolving the conflicts", "speed": 10 }