summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCI <CI@example.com>2020-10-06 09:23:09 +1100
committerJesse Duffield <jessedduffield@gmail.com>2020-10-10 00:23:01 +1100
commita9049b4a82e733521a0249c458eee0e9fdd1295f (patch)
treed444285e2c8589667b5632fc9b1aa53a9462b4e6
parentae352a5d8c29755f2b10c710b3338ab7ce10cb70 (diff)
stop using snapshots
-rw-r--r--.gitignore7
-rw-r--r--pkg/commands/oscommands/copy.go7
-rw-r--r--pkg/gui/gui_test.go87
-rw-r--r--test/integration/commit/expected/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/commit/expected/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/commit/expected/.git_keep/HEAD1
-rw-r--r--test/integration/commit/expected/.git_keep/config10
-rw-r--r--test/integration/commit/expected/.git_keep/description1
-rw-r--r--test/integration/commit/expected/.git_keep/indexbin0 -> 425 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/info/exclude7
-rw-r--r--test/integration/commit/expected/.git_keep/logs/HEAD5
-rw-r--r--test/integration/commit/expected/.git_keep/logs/refs/heads/master5
-rw-r--r--test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin0 -> 52 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin0 -> 103 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591bin0 -> 128 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433bebin0 -> 154 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920bin0 -> 148 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10fbin0 -> 21 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c2
-rw-r--r--test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf8230692
-rw-r--r--test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin0 -> 77 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin0 -> 21 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393bin0 -> 150 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bbbin0 -> 119 bytes
-rw-r--r--test/integration/commit/expected/.git_keep/refs/heads/master1
-rw-r--r--test/integration/commit/expected/myfile11
-rw-r--r--test/integration/commit/expected/myfile21
-rw-r--r--test/integration/commit/expected/myfile31
-rw-r--r--test/integration/commit/expected/myfile41
-rw-r--r--test/integration/commit/expected/myfile51
-rw-r--r--test/integration/commit/snapshot.txt57
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG20
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/HEAD1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/config10
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/description1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/indexbin0 -> 713 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/info/exclude7
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/logs/HEAD34
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch3
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop5
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking9
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master5
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch3
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c943
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9bin0 -> 157 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585dbin0 -> 112 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9bin0 -> 157 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09bin0 -> 34 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242cbin0 -> 177 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin0 -> 21 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7bin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27cabin0 -> 50 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b5
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77bin0 -> 144 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4afbin0 -> 117 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8abin0 -> 154 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885bin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1bin0 -> 34 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4bin0 -> 327 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92bin0 -> 145 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8bin0 -> 158 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8bin0 -> 150 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcdbin0 -> 120 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8cbin0 -> 252 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b3
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4bin0 -> 154 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864abin0 -> 155 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c251
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0bin0 -> 33 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3bin0 -> 86 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6bin0 -> 54 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9bin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc9726073412
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115abin0 -> 146 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1bin0 -> 121 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54bin0 -> 328 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/85/80d8908b1bfc6d71971e73812effa15c68ecf33
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8dbin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8bin0 -> 65 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cdbin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09cbin0 -> 358 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242bin0 -> 54 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a212
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin0 -> 21 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9cbin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03bin0 -> 154 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520bin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b204
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58bin0 -> 277 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993bin0 -> 303 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c34
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4bin0 -> 201 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0bin0 -> 227 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99abin0 -> 65 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e2
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin0 -> 21 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458fbin0 -> 157 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6ebin0 -> 50 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511bin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439bin0 -> 86 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3dbin0 -> 361 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7bin0 -> 66 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d554611
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2bin0 -> 144 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4bin0 -> 54 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec2
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007bin0 -> 352 bytes
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/refs/heads/master1
-rw-r--r--test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch1
-rw-r--r--test/integration/mergeConflicts/expected/directory/file1
-rw-r--r--test/integration/mergeConflicts/expected/directory/file21
-rw-r--r--test/integration/mergeConflicts/expected/file1
-rw-r--r--test/integration/mergeConflicts/expected/file163