summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-02-22 19:36:31 +1100
committerJesse Duffield <jessedduffield@gmail.com>2023-02-22 19:36:31 +1100
commit78f3a7a4786bf5f70af3489e6c4f2e44cddbd978 (patch)
tree4e1920587bb05585816107e05ab3c42a8fa9bfc6
parent526c9dea9b298d69a3fafec3303549b0d6292af4 (diff)
migrate interactive rebase integration tests
Diffstat
-rw-r--r--pkg/commands/git_commands/rebase.go35
-rw-r--r--pkg/gui/controllers/local_commits_controller.go6
-rw-r--r--pkg/integration/tests/interactive_rebase/move.go84
-rw-r--r--pkg/integration/tests/interactive_rebase/move_in_rebase.go96
-rw-r--r--pkg/integration/tests/interactive_rebase/one.go71
-rw-r--r--pkg/integration/tests/interactive_rebase/rebase.go122
-rw-r--r--pkg/integration/tests/interactive_rebase/reword_first_commit.go3
-rw-r--r--pkg/integration/tests/interactive_rebase/reword_last_commit.go38
-rw-r--r--pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go126
-rw-r--r--pkg/integration/tests/interactive_rebase/swap_with_conflict.go33
-rw-r--r--pkg/integration/tests/tests_gen.go7
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/COMMIT_EDITMSG30
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/config10
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/description1
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/indexbin353 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/logs/HEAD9
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/logs/refs/heads/master5
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bfbin155 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442bin50 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535dabin21 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97bin127 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3eebin148 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2efbin146 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2cbin101 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e23064946412
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a297583
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346cbin119 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edcbin147 -> 0 bytes
-rw-r--r--test/integration/rebase/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/rebase/expected/repo/file01
-rw-r--r--test/integration/rebase/expected/repo/file11
-rw-r--r--test/integration/rebase/expected/repo/file21
-rw-r--r--test/integration/rebase/expected/repo/file41
-rw-r--r--test/integration/rebase/recording.json1
-rw-r--r--test/integration/rebase/setup.sh26
-rw-r--r--test/integration/rebase/test.json1
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/COMMIT_EDITMSG16
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG4
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/REBASE_HEAD1
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/config10
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/description1
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/indexbin429 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/logs/HEAD10
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/logs/refs/heads/master7
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442bin50 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce33
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535dabin21 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97bin127 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bfbin147 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10fbin21 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b42
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30bebin65 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2cbin101 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205bin71 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57cbin153 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94bin161 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45bin158 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948bin127 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e23064946412
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e12642
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2bin127 -> 0 bytes
-rw-r--r--test/integration/rebase2/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/rebase2/expected/repo/file01
-rw-r--r--test/integration/rebase2/expected/repo/file11
-rw-r--r--test/integration/rebase2/expected/repo/file21
-rw-r--r--test/integration/rebase2/expected/repo/file41
-rw-r--r--test/integration/rebase2/recording.json1
-rw-r--r--test/integration/rebase2/setup.sh34
-rw-r--r--test/integration/rebase2/test.json1
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/COMMIT_EDITMSG27
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/config10
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/description1
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/indexbin353 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/logs/HEAD12
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/logs/refs/heads/master7
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442bin50 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535dabin21 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40ebin154 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97bin127 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597ccbin154 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10fbin21 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06cbin147 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26bin155 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292bin154 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9bin158 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2cbin101 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948bin127 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e23064946412
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530bin150 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac4
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866bin118 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2bin127 -> 0 bytes
-rw-r--r--test/integration/rebase3/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/rebase3/expected/repo/file01
-rw-r--r--test/integration/rebase3/expected/repo/file11
-rw-r--r--test/integration/rebase3/expected/repo/file21
-rw-r--r--test/integration/rebase3/expected/repo/file41
-rw-r--r--test/integration/rebase3/recording.json1
-rw-r--r--test/integration/rebase3/setup.sh34
-rw-r--r--test/integration/rebase3/test.json1
-rw-r--r--test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/COMMIT_EDITMSG24
-rw-r--r--test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/ORIG_HEAD1