diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-09 14:05:33 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-09 14:14:47 +1100 |
commit | 3b30b9bba260dc06a21a010cbb5a05f363f65a29 (patch) | |
tree | 59c7394c828442fd2ed89e75cef5910fa306bd21 | |
parent | e5096e71abfb078ff6c974ee5b7b746e3c9aafc6 (diff) |
add integration test for rewording old commit
63 files changed, 73 insertions, 0 deletions
diff --git a/test/integration/rebaseReword/expected/.git_keep/index b/test/integration/rebaseReword/expected/.git_keep/index Binary files differdeleted file mode 100644 index e4963c7ce..000000000 --- a/test/integration/rebaseReword/expected/.git_keep/index +++ /dev/null diff --git a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseRewordLastCommit/expected/.git_keep/COMMIT_EDITMSG index 3a4521c05..3a4521c05 100644 --- a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test/integration/rebaseReword/expected/.git_keep/FETCH_HEAD +++ b/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 index cb089cd89..cb089cd89 100644 --- a/test/integration/rebaseReword/expected/.git_keep/HEAD +++ b/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 index 8ae104545..8ae104545 100644 --- a/test/integration/rebaseReword/expected/.git_keep/config +++ b/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 index 498b267a8..498b267a8 100644 --- a/test/integration/rebaseReword/expected/.git_keep/description +++ b/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 Binary files differnew file mode 100644 index 000000000..8481c3b75 --- /dev/null +++ b/test/integration/rebaseRewordLastCommit/expected/.git_keep/index diff --git a/test/integration/rebaseReword/expected/.git_keep/info/exclude b/test/integration/rebaseRewordLastCommit/expected/.git_keep/info/exclude index 8e9f2071f..8e9f2071f 100644 --- a/test/integration/rebaseReword/expected/.git_keep/info/exclude +++ b/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 index 3646fdd64..3646fdd64 100644 --- a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD +++ b/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 index 3646fdd64..3646fdd64 100644 --- a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master +++ b/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 Binary files differindex f74bf2335..f74bf2335 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 +++ b/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 Binary files differindex 79fcadf67..79fcadf67 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 +++ b/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 Binary files differindex 06c9cb73d..06c9cb73d 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da +++ b/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 Binary files differindex 4cba53db2..4cba53db2 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 +++ b/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 Binary files differindex 6b21dff7e..6b21dff7e 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b +++ b/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 Binary files differindex e2ccd0b98..e2ccd0b98 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 +++ b/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 Binary files differindex 0e95eb06d..0e95eb06d 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c +++ b/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 Binary files differindex 285df3e5f..285df3e5f 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 +++ b/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 index 2e9066287..2e9066287 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ b/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 Binary files differindex b0cd18a51..b0cd18a51 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 +++ b/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 Binary files differindex 9b771fc2f..9b771fc2f 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b +++ b/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 index f07b23840..f07b23840 100644 --- a/test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 +++ b/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 index ada8401bb..ada8401bb 100644 --- a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master +++ b/test/integration/rebaseRewordLastCommit/expected/.git_keep/refs/heads/master diff --git a/test/integration/rebaseReword/expected/file0 b/test/integration/rebaseRewordLastCommit/expected/file0 index 38143ad4a..38143ad4a 100644 --- a/test/integration/rebaseReword/expected/file0 +++ b/test/integration/rebaseRewordLastCommit/expected/file0 diff --git a/test/integration/rebaseReword/expected/file1 b/test/integration/rebaseRewordLastCommit/expected/file1 index a5bce3fd2..a5bce3fd2 100644 --- a/test/integration/rebaseReword/expected/file1 +++ b/test/integration/rebaseRewordLastCommit/expected/file1 diff --git a/test/integration/rebaseReword/expected/file2 b/test/integration/rebaseRewordLastCommit/expected/file2 index 180cf8328..180cf8328 100644 --- a/test/integration/rebaseReword/expected/file2 +++ b/test/integration/rebaseRewordLastCommit/expected/file2 diff --git a/test/integration/rebaseReword/expected/file3 b/test/integration/rebaseRewordLastCommit/expected/file3 index df6b0d2bc..df6b0d2bc 100644 --- a/test/integration/rebaseReword/expected/file3 +++ b/test/integration/rebaseRewordLastCommit/expected/file3 diff --git a/test/integration/rebaseReword/recording.json b/test/integration/rebaseRewordLastCommit/recording.json index 4ffb9bd50..4ffb9bd50 100644 --- a/test/integration/rebaseReword/recording.json +++ b/test/integration/rebaseRewordLastCommit/recording.json diff --git a/test/integration/rebaseReword/setup.sh b/test/integration/rebaseRewordLastCommit/setup.sh index 42957e626..42957e626 100644 --- a/test/integration/rebaseReword/setup.sh +++ b/test/integration/rebaseRewordLastCommit/setup.sh diff --git a/test/integration/rebaseReword/test.json b/test/integration/rebaseRewordLastCommit/test.json index a1391f372..a1391f372 100644 --- a/test/integration/rebaseReword/test.json +++ b/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 --- /dev/null +++ b/test/integration/rebaseRewordOldCommit/expected/.git_keep/FETCH_HEAD 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 |