From 3b30b9bba260dc06a21a010cbb5a05f363f65a29 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 9 Jan 2022 14:05:33 +1100 Subject: [PATCH] add integration test for rewording old commit --- .../rebaseReword/expected/.git_keep/index | Bin 353 -> 0 bytes .../expected/.git_keep/COMMIT_EDITMSG | 0 .../expected/.git_keep/FETCH_HEAD | 0 .../expected/.git_keep/HEAD | 0 .../expected/.git_keep/config | 0 .../expected/.git_keep/description | 0 .../expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 0 .../expected/.git_keep/logs/HEAD | 0 .../expected/.git_keep/logs/refs/heads/master | 0 .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin .../59/f4e88de812c15bf0fa7b224cdb361f7ede8931 | Bin .../74/abc9e0d0ec8dd0f5ea872a851364206008ea2b | Bin .../97/066d3866b8e5ead0b68fc746a02222408f28a3 | Bin .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 0 .../d4/83ea1d742e44d9191f3e31e926d7621c513042 | Bin .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin .../e2/98537fd470f70bbb174d78f610fe49539cfe66 | 0 .../expected/.git_keep/refs/heads/master | 0 .../expected/file0 | 0 .../expected/file1 | 0 .../expected/file2 | 0 .../expected/file3 | 0 .../recording.json | 0 .../setup.sh | 0 .../test.json | 0 .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 10 ++++++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 334 bytes .../expected/.git_keep/info/exclude | 7 ++++++ .../expected/.git_keep/logs/HEAD | 9 +++++++ .../expected/.git_keep/logs/refs/heads/master | 4 +++ .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 | Bin 0 -> 150 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f | Bin 0 -> 147 bytes .../44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 | Bin 0 -> 118 bytes .../64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe | 4 +++ .../7c/5b8c907caad01842aa84e91b7d4724d57de4fd | Bin 0 -> 149 bytes .../9d/793e4fc04a0583eed7670d52fbb16b402f7499 | Bin 0 -> 150 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../c0/793b482cdf9ca48686dbf56fc0a46e982003e1 | Bin 0 -> 161 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../d4/83ea1d742e44d9191f3e31e926d7621c513042 | Bin 0 -> 127 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + .../rebaseRewordOldCommit/expected/file0 | 1 + .../rebaseRewordOldCommit/expected/file1 | 1 + .../rebaseRewordOldCommit/expected/file2 | 1 + .../rebaseRewordOldCommit/expected/file3 | 1 + .../rebaseRewordOldCommit/recording.json | 1 + .../rebaseRewordOldCommit/setup.sh | 23 ++++++++++++++++++ .../rebaseRewordOldCommit/test.json | 4 +++ 63 files changed, 73 insertions(+) delete mode 100644 test/integration/rebaseReword/expected/.git_keep/index rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/COMMIT_EDITMSG (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/FETCH_HEAD (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/HEAD (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/config (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/description (100%) create mode 100644 test/integration/rebaseRewordLastCommit/expected/.git_keep/index rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/info/exclude (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/logs/HEAD (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/logs/refs/heads/master (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/.git_keep/refs/heads/master (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/file0 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/file1 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/file2 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/expected/file3 (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/recording.json (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/setup.sh (100%) rename test/integration/{rebaseReword => rebaseRewordLastCommit}/test.json (100%) create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/HEAD create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/config create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/description create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/index create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/info/exclude create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/HEAD create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/rebaseRewordOldCommit/expected/.git_keep/refs/heads/master create mode 100644 test/integration/rebaseRewordOldCommit/expected/file0 create mode 100644 test/integration/rebaseRewordOldCommit/expected/file1 create mode 100644 test/integration/rebaseRewordOldCommit/expected/file2 create mode 100644 test/integration/rebaseRewordOldCommit/expected/file3 create mode 100644 test/integration/rebaseRewordOldCommit/recording.json create mode 100644 test/integration/rebaseRewordOldCommit/setup.sh create mode 100644 test/integration/rebaseRewordOldCommit/test.json diff --git a/test/integration/rebaseReword/expected/.git_keep/index b/test/integration/rebaseReword/expected/.git_keep/index deleted file mode 100644 index e4963c7ceb21fada67146a08ec9f0e84a2b3f34d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ?q402{*U|<4bmV_KpChkd3*fAK>pKHO;}Ql2#;-s%B0$V$A!2o9!9T5S z?}87#?_7HG(cY=1w-{K{GILT5fYJ;MApJa>o_D}#h&kDO=;kcl^Z2i7>WwcEp;0{f zP8R~aTDq@7%rS(U!+Y*!8^|0G4K+s|-5d#?A4UyI`_8>wwJ5x*zvY$od<%7mIYw}E z_@1bO-36kd<^Uaw>aY9RyxM2Vp1t8erEo}Hz{_7_*AZ!mImTdfLV{dffec9o69ogV uE6uNDOY~fBO3K?AzEr!OBok=hG}Y4F|IhUs{~5Pb-Pt~4*LM5LZ&v~JBWc$F diff --git a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseRewordLastCommit/expected/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/rebaseReword/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseRewordLastCommit/expected/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/FETCH_HEAD rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/FETCH_HEAD diff --git a/test/integration/rebaseReword/expected/.git_keep/HEAD b/test/integration/rebaseRewordLastCommit/expected/.git_keep/HEAD similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/HEAD rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/HEAD diff --git a/test/integration/rebaseReword/expected/.git_keep/config b/test/integration/rebaseRewordLastCommit/expected/.git_keep/config similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/config rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/config diff --git a/test/integration/rebaseReword/expected/.git_keep/description b/test/integration/rebaseRewordLastCommit/expected/.git_keep/description similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/description rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/description diff --git a/test/integration/rebaseRewordLastCommit/expected/.git_keep/index b/test/integration/rebaseRewordLastCommit/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..8481c3b759da7c7b0750a6d3ae0dbce36e4731d7 GIT binary patch literal 353 zcmZ?q402{*U|<4bmc$#ZW~v@Lx4~#e1_oBfZ@eEE7#f!_Ffe`vsu2NVHVYA}D+~T< zZF?7d=zZtXn~(NRHNC~anwFW9Y5Angv#}HwT-<309bAU9|oKNWHNbvkHYEasD?&YdQ;Z^-Due9e|s6)&#LYNcW z2{8vqL(Tb&ZqEH|UhOkw&))E#QaGe8;N`Ee>xeYO9AmIKAwjOLK!zlPiGl&wmF8En qC3-G5CFSi5U#eYCk_j|$Vq0y}U&*M(c4Fn?1&_~2e?R}$s1N|-T5ps9 literal 0 HcmV?d00001 diff --git a/test/integration/rebaseReword/expected/.git_keep/info/exclude b/test/integration/rebaseRewordLastCommit/expected/.git_keep/info/exclude similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/info/exclude rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/info/exclude diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD b/test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/HEAD similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/logs/HEAD rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/HEAD diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/refs/heads/master similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/logs/refs/heads/master diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 b/test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 diff --git a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master b/test/integration/rebaseRewordLastCommit/expected/.git_keep/refs/heads/master similarity index 100% rename from test/integration/rebaseReword/expected/.git_keep/refs/heads/master rename to test/integration/rebaseRewordLastCommit/expected/.git_keep/refs/heads/master diff --git a/test/integration/rebaseReword/expected/file0 b/test/integration/rebaseRewordLastCommit/expected/file0 similarity index 100% rename from test/integration/rebaseReword/expected/file0 rename to test/integration/rebaseRewordLastCommit/expected/file0 diff --git a/test/integration/rebaseReword/expected/file1 b/test/integration/rebaseRewordLastCommit/expected/file1 similarity index 100% rename from test/integration/rebaseReword/expected/file1 rename to test/integration/rebaseRewordLastCommit/expected/file1 diff --git a/test/integration/rebaseReword/expected/file2 b/test/integration/rebaseRewordLastCommit/expected/file2 similarity index 100% rename from test/integration/rebaseReword/expected/file2 rename to test/integration/rebaseRewordLastCommit/expected/file2 diff --git a/test/integration/rebaseReword/expected/file3 b/test/integration/rebaseRewordLastCommit/expected/file3 similarity index 100% rename from test/integration/rebaseReword/expected/file3 rename to test/integration/rebaseRewordLastCommit/expected/file3 diff --git a/test/integration/rebaseReword/recording.json b/test/integration/rebaseRewordLastCommit/recording.json similarity index 100% rename from test/integration/rebaseReword/recording.json rename to test/integration/rebaseRewordLastCommit/recording.json diff --git a/test/integration/rebaseReword/setup.sh b/test/integration/rebaseRewordLastCommit/setup.sh similarity index 100% rename from test/integration/rebaseReword/setup.sh rename to test/integration/rebaseRewordLastCommit/setup.sh diff --git a/test/integration/rebaseReword/test.json b/test/integration/rebaseRewordLastCommit/test.json similarity index 100% rename from test/integration/rebaseReword/test.json rename to test/integration/rebaseRewordLastCommit/test.json diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseRewordOldCommit/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..996bc28b7 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +file1 2 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/FETCH_HEAD b/test/integration/rebaseRewordOldCommit/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/HEAD b/test/integration/rebaseRewordOldCommit/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/ORIG_HEAD b/test/integration/rebaseRewordOldCommit/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..62f236fad --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/config b/test/integration/rebaseRewordOldCommit/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/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/rebaseRewordOldCommit/expected/.git_keep/description b/test/integration/rebaseRewordOldCommit/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/index b/test/integration/rebaseRewordOldCommit/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..c1bf8572e06db0e0583f12ba61b23cd6e7f8d0a2 GIT binary patch literal 334 zcmZ?q402{*U|<4bmc(0ruEIO4wt{I}k^hVg46KZQer#l5Xk5a;!1xuYMg)l2EJUoX zEcmCj?OpJp_nk{`KH59g^cDkaT4qkF0Z^KO0i<7~x>p=*&i*|wpyq5sH)rXd$A48* zZ+wXejpE67x)9*i(tQTh|a zJ>NndVvZ5q95Jq?Y9Mn&1Fy+J&Dnx(&i!m&?K5T1-teDNIHWG%<*%{ph&03;W3V|P lL9VVq1{;H}p@IR|&J|~^a-UTS>2QUvVtvD2Uh#JI9{@|3Yaajr literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/info/exclude b/test/integration/rebaseRewordOldCommit/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/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/rebaseRewordOldCommit/expected/.git_keep/logs/HEAD b/test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..2fd699dc0 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI 1641696830 +1100 commit (initial): file0 +4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI 1641696830 +1100 commit: file1 +3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI 1641696830 +1100 commit: file2 +7c5b8c907caad01842aa84e91b7d4724d57de4fd 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI 1641696835 +1100 rebase: updating HEAD +7c5b8c907caad01842aa84e91b7d4724d57de4fd 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI 1641696835 +1100 rebase -i (start): checkout 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 +4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI 1641696835 +1100 rebase -i: fast-forward +3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 1bcb7e30b3a5a5ae64397dcfe6b74cc18fc55784 CI 1641696835 +1100 commit (amend): file1 2 +1bcb7e30b3a5a5ae64397dcfe6b74cc18fc55784 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI 1641696835 +1100 rebase -i (pick): file2 +9d793e4fc04a0583eed7670d52fbb16b402f7499 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI 1641696835 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..e62904977 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI 1641696830 +1100 commit (initial): file0 +4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI 1641696830 +1100 commit: file1 +3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI 1641696830 +1100 commit: file2 +7c5b8c907caad01842aa84e91b7d4724d57de4fd 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI 1641696835 +1100 rebase -i (finish): refs/heads/master onto 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 new file mode 100644 index 0000000000000000000000000000000000000000..189a77100775bef6973b6b0020c7e35b0986a5ea GIT binary patch literal 150 zcmV;H0BQet0fmms3c@fD06pg`_Abcgodpr0r+&tEv%!M3r9|-a?ZLa(VHif%Wtlrz z3a7rSLdBd!NCb(6*;Sv~B$+9;>eYEnfkFz_Y`p8MLkO7!*-F;nIY#!J2x-z%xLB+c zSKlN!!|(oBcNj*v4&z-vylhXs$hzFX9=$}Vc!aaHh~}WjRM$Ux{OP96PqpC87c3Jx EJag+!j{pDw literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 0000000000000000000000000000000000000000..06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c GIT binary patch literal 21 ccmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f new file mode 100644 index 0000000000000000000000000000000000000000..91e0c959b173cb0c2e17e71f670680030e6cae6e GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0?{jk-`uA*VcJv#vA{n-DDY`OOo09fo0KYi;Qk z$zA%PY73+&LLxvc%&z!YXGu&$Enc067%0SmX6HlS-G-1zfKieL&%?l;BLU5tGiQV{ zbMaMzGyLhV?Xcry@8k5;FSmWwn{4f2@$5y4*@L|z0+^GYQ(gbmOZ9IpZrn BNHYKc literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 new file mode 100644 index 0000000000000000000000000000000000000000..a62257409302d66d0ee068dbab2574060f4b61b1 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NyoGUB0^U^M$-JjLPJZ5;PLGd+&(^d^H%H9 zNK`NF07%dw^vTR}l6xOw7J!FTw6IUPc!Qd%ck$ES+d<<*k8yh88|%K}HgEMw5>$eP Yp<}v=FuSv!lZHRJE6WOYKir@z^krE);Q#;t literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe new file mode 100644 index 000000000..1a7ba1071 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe @@ -0,0 +1,4 @@ +xAj1 e˶J dUΠd3aƁ>_Åc5sA C +ZVC֒H1LO^1\4T_Y=fB0PSQæ^|qF + +#e:xl`׸-;_r_;ҿd\3>u&y76xGL} \ No newline at end of file diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd new file mode 100644 index 0000000000000000000000000000000000000000..c7c3a41831bbe6bfc9750fccb958b0b408a76e4c GIT binary patch literal 149 zcmV;G0BZku0gcW<3d0}}K+&!}h5JHrMx!H?QphUD(3z12k|qQTJ$`e9Za;7Fd0W@H zTgZ6nhpNp=RFV@WAr!&VYLmf1irNw>5TUP(Z1!^KyIap5a41bui6ITbB7sAR6&-U% zS3PLWv6=GeukEnoWbfnj)Nfh$MQ^;V4+}9s%#pmaR{-bCSH|Tm?+Q!^xbiWi)ruIb*cb(J{HRDDrhCkTp}n=W zONjc?Pi7ezF$Gl!3+hsIs<{@YAb73;84$I}q)8m<%1 z04q5c(2Df#&;6A1BByzI@F%rn;~VYmF2P&y(W6oF3ZRr2>xk<7M|VG6)OBMmz7|6| EnLNWtLjV8( literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 new file mode 100644 index 0000000000000000000000000000000000000000..da9c5bc32fb6a07a1140344e0018b8b4e2cb1801 GIT binary patch literal 161 zcmV;S0ABxi0gaB!3c@fD06pg`_AW>^+2$c4f~S7QHoL`wX-kdZ=i7^Sufq&XS!$gc zIE;t3se(}Q$|#YX5=q94qgRibU62?YmJYooXI9>HZV*d1q>^nc%wjQ-V@{+QhbR;s zNf$+F6vOZKST?x#aJlz4{cv5MdMZo30tUj6L-HLQ5v?^l-KU!VshepQ{lGFq<=0-F Pe^)S0Pj%)CAQ3@HXyHjh literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/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/rebaseRewordOldCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 new file mode 100644 index 0000000000000000000000000000000000000000..b0cd18a517f105dfb9219a4e44c7514c7a1a4757 GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKWZpUta%rtH}p{!>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/refs/heads/master b/test/integration/rebaseRewordOldCommit/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..d952177d9 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +9d793e4fc04a0583eed7670d52fbb16b402f7499 diff --git a/test/integration/rebaseRewordOldCommit/expected/file0 b/test/integration/rebaseRewordOldCommit/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/rebaseRewordOldCommit/expected/file1 b/test/integration/rebaseRewordOldCommit/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/rebaseRewordOldCommit/expected/file2 b/test/integration/rebaseRewordOldCommit/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/rebaseRewordOldCommit/expected/file3 b/test/integration/rebaseRewordOldCommit/expected/file3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/file3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/rebaseRewordOldCommit/recording.json b/test/integration/rebaseRewordOldCommit/recording.json new file mode 100644 index 000000000..0d27c4c7f --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1013,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1332,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1811,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2643,"Mod":0,"Key":256,"Ch":114},{"Timestamp":3269,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3795,"Mod":0,"Key":256,"Ch":50},{"Timestamp":4420,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5859,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseRewordOldCommit/setup.sh b/test/integration/rebaseRewordOldCommit/setup.sh new file mode 100644 index 000000000..42957e626 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/setup.sh @@ -0,0 +1,23 @@ +#!/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 > file3 +git add . diff --git a/test/integration/rebaseRewordOldCommit/test.json b/test/integration/rebaseRewordOldCommit/test.json new file mode 100644 index 000000000..b75601d7e --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/test.json @@ -0,0 +1,4 @@ +{ + "description": "Rewording old commit", + "speed": 20 +}