diff --git a/test/integration/rebaseReword/expected/.git_keep/index b/test/integration/rebaseReword/expected/.git_keep/index deleted file mode 100644 index e4963c7ce..000000000 Binary files a/test/integration/rebaseReword/expected/.git_keep/index and /dev/null differ 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 000000000..8481c3b75 Binary files /dev/null and b/test/integration/rebaseRewordLastCommit/expected/.git_keep/index differ 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 000000000..c1bf8572e Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/index differ 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 000000000..f74bf2335 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ 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 000000000..189a77100 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 differ 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 000000000..79fcadf67 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ 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 000000000..06c9cb73d Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ 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 000000000..91e0c959b Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f differ 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 000000000..a62257409 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 differ 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 000000000..c7c3a4183 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd differ diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 new file mode 100644 index 000000000..a7b197eb9 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 differ 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 000000000..0e95eb06d Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ 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 000000000..285df3e5f Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ 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 000000000..da9c5bc32 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 differ 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 000000000..b0cd18a51 Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 differ diff --git a/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/rebaseRewordOldCommit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ 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 +}