summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-10-22 20:18:40 +1100
committerJesse Duffield <jessedduffield@gmail.com>2021-10-22 21:33:17 +1100
commit2008c3951616f9b366b320e805dcbd0c5da6ce96 (patch)
tree5d4efb2a961acd1cdeca293e2771f8a34764cfcb
parent6388af70acda91bf1bdc9cba9f38dc810f49f9ca (diff)
add tests for dealing with remotes
-rw-r--r--.gitignore4
-rw-r--r--pkg/gui/custom_commands_test.go63
-rw-r--r--pkg/gui/gui_test.go60
-rw-r--r--pkg/integration/integration.go76
-rw-r--r--test/integration/forcePush/expected/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/forcePush/expected/.git_keep/FETCH_HEAD1
-rw-r--r--test/integration/forcePush/expected/.git_keep/HEAD1
-rw-r--r--test/integration/forcePush/expected/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/forcePush/expected/.git_keep/config16
-rw-r--r--test/integration/forcePush/expected/.git_keep/description1
-rw-r--r--test/integration/forcePush/expected/.git_keep/indexbin0 -> 281 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/info/exclude7
-rw-r--r--test/integration/forcePush/expected/.git_keep/logs/HEAD5
-rw-r--r--test/integration/forcePush/expected/.git_keep/logs/refs/heads/master5
-rw-r--r--test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master3
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd92785
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63bin0 -> 149 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfbbin0 -> 149 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd3
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin0 -> 103 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected/.git_keep/refs/heads/master1
-rw-r--r--test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master1
-rw-r--r--test/integration/forcePush/expected/myfile11
-rw-r--r--test/integration/forcePush/expected/myfile21
-rw-r--r--test/integration/forcePush/expected/myfile41
-rw-r--r--test/integration/forcePush/expected_remote/HEAD1
-rw-r--r--test/integration/forcePush/expected_remote/config8
-rw-r--r--test/integration/forcePush/expected_remote/description1
-rw-r--r--test/integration/forcePush/expected_remote/info/exclude7
-rw-r--r--test/integration/forcePush/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd92785
-rw-r--r--test/integration/forcePush/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63bin0 -> 149 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfbbin0 -> 149 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd3
-rw-r--r--test/integration/forcePush/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin0 -> 103 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/forcePush/expected_remote/packed-refs2
-rw-r--r--test/integration/forcePush/expected_remote/refs/heads/master1
-rw-r--r--test/integration/forcePush/recording.json1
-rw-r--r--test/integration/forcePush/setup.sh39
-rw-r--r--test/integration/forcePush/test.json1
-rw-r--r--test/integration/pull/expected/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/pull/expected/.git_keep/FETCH_HEAD1
-rw-r--r--test/integration/pull/expected/.git_keep/HEAD1
-rw-r--r--test/integration/pull/expected/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/pull/expected/.git_keep/config16
-rw-r--r--test/integration/pull/expected/.git_keep/description1
-rw-r--r--test/integration/pull/expected/.git_keep/indexbin0 -> 353 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/info/exclude7
-rw-r--r--test/integration/pull/expected/.git_keep/logs/HEAD6
-rw-r--r--test/integration/pull/expected/.git_keep/logs/refs/heads/master6
-rw-r--r--test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master1
-rw-r--r--test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea002
-rw-r--r--test/integration/pull/expected/.git_keep/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fabin0 -> 148 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591bin0 -> 128 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5abin0 -> 150 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec12
-rw-r--r--test/integration/pull/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected/.git_keep/refs/heads/master1
-rw-r--r--test/integration/pull/expected/.git_keep/refs/remotes/origin/master1
-rw-r--r--test/integration/pull/expected/myfile11
-rw-r--r--test/integration/pull/expected/myfile21
-rw-r--r--test/integration/pull/expected/myfile31
-rw-r--r--test/integration/pull/expected/myfile41
-rw-r--r--test/integration/pull/expected_remote/HEAD1
-rw-r--r--test/integration/pull/expected_remote/config8
-rw-r--r--test/integration/pull/expected_remote/description1
-rw-r--r--test/integration/pull/expected_remote/info/exclude7
-rw-r--r--test/integration/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea002
-rw-r--r--test/integration/pull/expected_remote/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fabin0 -> 148 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591bin0 -> 128 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5abin0 -> 150 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec12
-rw-r--r--test/integration/pull/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/pull/expected_remote/packed-refs2
-rw-r--r--test/integration/pull/recording.json1
-rw-r--r--test/integration/pull/setup.sh34
-rw-r--r--test/integration/pull/test.json1
-rw-r--r--test/integration/pullMerge/expected/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/pullMerge/expected/.git_keep/FETCH_HEAD1
-rw-r--r--test/integration/pullMerge/expected/.git_keep/HEAD1
-rw-r--r--test/integration/pullMerge/expected/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/pullMerge/expected/.git_keep/config18
-rw-r--r--test/integration/pullMerge/expected/.git_keep/description1
-rw-r--r--test/integration/pullMerge/expected/.git_keep/indexbin0 -> 353 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/info/exclude7
-rw-r--r--test/integration/pullMerge/expected/.git_keep/logs/HEAD7
-rw-r--r--test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master7
-rw-r--r--test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master1
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/2a/0805355a8040f9eebfa2dbf70b8bc313d6f456bin0 -> 150 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591bin0 -> 128 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d701242
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/70/3e85166069a42b4254af06b68dffc159ea3f24bin0 -> 150 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a83
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1bin0 -> 149 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/b1/0baba2f9d877322f94f8770e2e0c8ab1db6bccbin0 -> 204 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin0 -> 103 bytes
-rw-r--r--test/integration/pullMerge/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--