From a9049b4a82e733521a0249c458eee0e9fdd1295f Mon Sep 17 00:00:00 2001 From: CI Date: Tue, 6 Oct 2020 09:23:09 +1100 Subject: [PATCH] stop using snapshots --- .gitignore | 7 +- pkg/commands/oscommands/copy.go | 7 +- pkg/gui/gui_test.go | 87 +++++-- .../commit/expected/.git_keep/COMMIT_EDITMSG | 1 + .../commit/expected/.git_keep/FETCH_HEAD | 0 .../commit/expected/.git_keep/HEAD | 1 + .../commit/expected/.git_keep/config | 10 + .../commit/expected/.git_keep/description | 1 + .../commit/expected/.git_keep/index | Bin 0 -> 425 bytes .../commit/expected/.git_keep/info/exclude | 7 + .../commit/expected/.git_keep/logs/HEAD | 5 + .../expected/.git_keep/logs/refs/heads/master | 5 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../30/a1ca3481fdec3245b02aeacfb72ddfe2a433be | Bin 0 -> 154 bytes .../45/9260de735f85c64517eef30e6a2d2236f3f920 | Bin 0 -> 148 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../60/100545975af038486a0265a786b78c090faa4c | 2 + .../7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 | 2 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 | Bin 0 -> 150 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../f4/473317f8385f84b8054f3e9e9895870aa339bb | Bin 0 -> 119 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/commit/expected/myfile1 | 1 + test/integration/commit/expected/myfile2 | 1 + test/integration/commit/expected/myfile3 | 1 + test/integration/commit/expected/myfile4 | 1 + test/integration/commit/expected/myfile5 | 1 + test/integration/commit/snapshot.txt | 57 ----- .../expected/.git_keep/COMMIT_EDITMSG | 20 ++ .../expected/.git_keep/FETCH_HEAD | 0 .../mergeConflicts/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../mergeConflicts/expected/.git_keep/config | 10 + .../expected/.git_keep/description | 1 + .../mergeConflicts/expected/.git_keep/index | Bin 0 -> 713 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 34 +++ .../.git_keep/logs/refs/heads/base_branch | 3 + .../.git_keep/logs/refs/heads/develop | 5 + .../logs/refs/heads/feature/cherry-picking | 9 + .../expected/.git_keep/logs/refs/heads/master | 5 + .../.git_keep/logs/refs/heads/other_branch | 3 + .../02/caf2708fbff792572b0c30efaeddd214525c94 | 3 + .../07/392b739784503a325278fedf5251ecb7c3bca9 | Bin 0 -> 157 bytes .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 0 -> 112 bytes .../14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 | Bin 0 -> 157 bytes .../17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 | Bin 0 -> 34 bytes .../17/4a8c9444cfa700682d74059d9fa9be5749242c | Bin 0 -> 177 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 | Bin 0 -> 66 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 0 -> 50 bytes .../1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b | 5 + .../20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 | Bin 0 -> 144 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 0 -> 117 bytes .../22/3a2caff009cc142bfa9b5889963a75c8004e8a | Bin 0 -> 154 bytes .../22/b0fd807dd5e428c2d818aef6a2311d7c11e885 | Bin 0 -> 66 bytes .../24/10ee12b940bade9d9e99413732faa6dc60adb1 | Bin 0 -> 34 bytes .../24/6f7487e08e6330ccbec4053e701145d53f64d4 | Bin 0 -> 327 bytes .../27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 | Bin 0 -> 145 bytes .../27/bff1745d1ab39754071c9b225971867ea2a8a8 | Bin 0 -> 158 bytes .../2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 | Bin 0 -> 150 bytes .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 0 -> 120 bytes .../36/e0ef3e52c6e29e64980c71defbab6064d2da8c | Bin 0 -> 252 bytes .../4a/5f9db9c8d46ac099de054e42e17a157ee3909b | 3 + .../4d/81feb29b83b1a26754d0f480427a13dce491f4 | Bin 0 -> 154 bytes .../4e/3f39dbce8ac07b560685d22d761138954a864a | Bin 0 -> 155 bytes .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 + .../5d/a4d9200457542d875fe4def54ac98c16332db0 | Bin 0 -> 33 bytes .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 0 -> 86 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 0 -> 54 bytes .../61/01e935461d4cd862ae4a720846e87880d198b9 | Bin 0 -> 66 bytes .../65/73f823441ea560245f56e735d7cbc972607341 | 2 + .../65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a | Bin 0 -> 146 bytes .../70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 | Bin 0 -> 121 bytes .../78/3666de4acbb22a9efc205197667f5136118c54 | Bin 0 -> 328 bytes .../85/80d8908b1bfc6d71971e73812effa15c68ecf3 | 3 + .../88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d | Bin 0 -> 66 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 0 -> 65 bytes .../90/a84fd62f8033027fab3e567a81d5ed2a6a71cd | Bin 0 -> 66 bytes .../95/9d7a10da71acf97b17300b40a3b4f30903e09c | Bin 0 -> 358 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 0 -> 54 bytes .../a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 | 2 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../af/a76754c933269d7cd45630a7184a20849dbe9c | Bin 0 -> 66 bytes .../b2/6567e4fd73c518dd6531825d81a389fa49fe03 | Bin 0 -> 154 bytes .../b4/121e2d6aa156227b6541431ddfb8594904b520 | Bin 0 -> 66 bytes .../bf/e07eeabbfcde2e7d6856918dd494c703864b20 | 4 + .../c1/dd146476a4a37fff75b88612a718281ea83b58 | Bin 0 -> 277 bytes .../d0/60f7226715ca55b04e91fad2b8aca01badd993 | Bin 0 -> 303 bytes .../d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 | 4 + .../d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 | Bin 0 -> 201 bytes .../da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 | Bin 0 -> 227 bytes .../dc/51702c869f97b9ae4e236dc7684c55816fd99a | Bin 0 -> 65 bytes .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 + .../de/8c7134958792e1bff9b33cca090287def37f7e | 2 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e2/17a1e8fe2e038fdc59202dee120f081ecf458f | Bin 0 -> 157 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 0 -> 50 bytes .../e4/48ae5bf6371d80ebee24a22b6df341797a6511 | Bin 0 -> 66 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 0 -> 86 bytes .../ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d | Bin 0 -> 361 bytes .../eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 | Bin 0 -> 66 bytes .../ed/21fe1044b8600683ec6c2abbf86195a4d55461 | 1 + .../f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 | Bin 0 -> 144 bytes .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 0 -> 54 bytes .../f5/794ed7a2233f8a01fea032de77d2bc6a02aaec | 2 + .../fd/31cea7e0b6e8d334280be34db8dd86cdda3007 | Bin 0 -> 352 bytes .../expected/.git_keep/refs/heads/base_branch | 1 + .../expected/.git_keep/refs/heads/develop | 1 + .../refs/heads/feature/cherry-picking | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/heads/other_branch | 1 + .../mergeConflicts/expected/directory/file | 1 + .../mergeConflicts/expected/directory/file2 | 1 + test/integration/mergeConflicts/expected/file | 1 + .../integration/mergeConflicts/expected/file1 | 63 +++++ .../integration/mergeConflicts/expected/file3 | 1 + .../integration/mergeConflicts/expected/file4 | 1 + .../integration/mergeConflicts/expected/file5 | 1 + test/integration/mergeConflicts/snapshot.txt | 241 ------------------ .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../patchBuilding/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../patchBuilding/expected/.git_keep/config | 10 + .../expected/.git_keep/description | 1 + .../patchBuilding/expected/.git_keep/index | Bin 0 -> 281 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 10 + .../expected/.git_keep/logs/refs/heads/master | 6 + .../01/5689313279311c9356ea3fd3628f73ca4ea797 | Bin 0 -> 77 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../19/c35a6c6e60aead9beb704c336f95a9c34eb272 | Bin 0 -> 119 bytes .../23/22f6373956d9d54470640e71ff258d609c61bd | Bin 0 -> 149 bytes .../47/5a06b7978eef6509efdd2a86e341992d9f2908 | Bin 0 -> 41 bytes .../51/d06e68d1780c3af5ec14e8a8a6250693dea430 | Bin 0 -> 147 bytes .../52/863675692b53d9e34dd72da8c35a72bf0a5b51 | Bin 0 -> 43 bytes .../84/166fe7febd3d82c087a5261a34a5e0dabeebbc | Bin 0 -> 154 bytes .../93/96d8d0c471661257f6c16c1957452912c0c6f5 | Bin 0 -> 41 bytes .../a2/96781a25a5bd97a0024744488d9ba39189bf19 | Bin 0 -> 154 bytes .../a3/2f90adf7ee0f14ae300e49cdf8779507746c27 | Bin 0 -> 103 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../ab/e7653e9667153c8086f477217f8fb571731132 | Bin 0 -> 150 bytes .../ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f | Bin 0 -> 158 bytes .../ad/e030587c8ae5d240ad7669bff9030b24bd6385 | Bin 0 -> 77 bytes .../ce/024fc694fd464cfb5b43cb7702f0bd7345d882 | Bin 0 -> 77 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e3/31050363ceb0b12d9d042e37879d892d867ea0 | Bin 0 -> 103 bytes .../f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a | Bin 0 -> 39 bytes .../expected/.git_keep/refs/heads/master | 1 + .../patchBuilding/expected/myfile1 | 1 + .../patchBuilding/expected/myfile2 | 3 + .../patchBuilding/expected/myfile3 | 1 + test/integration/patchBuilding/snapshot.txt | 63 ----- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../patchBuilding2/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../patchBuilding2/expected/.git_keep/config | 10 + .../expected/.git_keep/description | 1 + .../patchBuilding2/expected/.git_keep/index | Bin 0 -> 209 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 7 + .../expected/.git_keep/logs/refs/heads/master | 6 + .../expected/.git_keep/logs/refs/stash | 1 + .../01/287c3b620e4e8db2cef27436347eb4a92e0d56 | Bin 0 -> 150 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../52/863675692b53d9e34dd72da8c35a72bf0a5b51 | Bin 0 -> 43 bytes .../5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba | Bin 0 -> 77 bytes .../60/39f2c23e9f10c8b11e82639bdceafb795ec7ab | Bin 0 -> 164 bytes .../8d/d7331351a6d2b809cbab136a83f8c69abb0b4d | Bin 0 -> 154 bytes .../93/96d8d0c471661257f6c16c1957452912c0c6f5 | Bin 0 -> 41 bytes .../a3/2f90adf7ee0f14ae300e49cdf8779507746c27 | Bin 0 -> 103 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../ad/e030587c8ae5d240ad7669bff9030b24bd6385 | Bin 0 -> 77 bytes .../ce/024fc694fd464cfb5b43cb7702f0bd7345d882 | Bin 0 -> 77 bytes .../d0/15c882b061d63669daf4b25c918c8155d88c66 | 3 + .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 | Bin 0 -> 119 bytes .../eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 | Bin 0 -> 149 bytes .../f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e | 2 + .../f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a | Bin 0 -> 39 bytes .../expected/.git_keep/refs/heads/master | 1 + .../expected/.git_keep/refs/stash | 1 + .../patchBuilding2/expected/myfile1 | 1 + .../patchBuilding2/expected/myfile2 | 3 + test/integration/patchBuilding2/snapshot.txt | 40 --- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../searching/expected/.git_keep/FETCH_HEAD | 0 .../searching/expected/.git_keep/HEAD | 1 + .../searching/expected/.git_keep/ORIG_HEAD | 1 + .../searching/expected/.git_keep/config | 10 + .../searching/expected/.git_keep/description | 1 + .../searching/expected/.git_keep/index | Bin 0 -> 353 bytes .../searching/expected/.git_keep/info/exclude | 7 + .../searching/expected/.git_keep/logs/HEAD | 10 + .../expected/.git_keep/logs/refs/heads/master | 7 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../29/cfbab279d8677b1614786c8161d915c3851334 | Bin 0 -> 77 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../35/98e6458e34f1a1c51ffbbc3f9073b8dd4694eb | Bin 0 -> 103 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../56/a707665291bb59eff01a7c25f14c3e9ad9a28d | Bin 0 -> 148 bytes .../8e/4d1c97ee8e375b218257ed805954c4508f188a | Bin 0 -> 103 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../b5/551403e8d2c3d141e8b4523e4b9892337fec8a | Bin 0 -> 152 bytes .../c3/53473bb2ef43d48a78ed053bc2e1f280e37215 | 2 + .../ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 | 2 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e0/f0a11e4de3f37f143b508c0084a4d58a672afc | Bin 0 -> 149 bytes .../f6/12cb91eecb4ccf9e47dfda31ca63ab700d5383 | Bin 0 -> 148 bytes .../fc/34f28ab77f236452f97c9cf8fdfe687d23938e | Bin 0 -> 146 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/searching/expected/myfile1 | 1 + test/integration/searching/expected/myfile3 | 1 + test/integration/searching/expected/myfile5 | 1 + test/integration/searching/snapshot.txt | 35 --- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/config | 10 + .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 137 bytes .../expected/.git_keep/info/exclude | 7 + .../expected/.git_keep/logs/HEAD | 3 + .../expected/.git_keep/logs/refs/heads/master | 3 + .../02/64611003567cbe3b08955a8e745786c688ec7a | 2 + .../16/4d8eaeabbb4b1082fdfb6735be0134535340b2 | Bin 0 -> 52 bytes .../4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 | Bin 0 -> 52 bytes .../5f/82960be010ac424ab7485684942813aff754e8 | Bin 0 -> 147 bytes .../6b/f2cc26256f2eae6ed4058ce1bc924b84a560f0 | Bin 0 -> 52 bytes .../7b/ba8c8e64b598d317cdf1bb8a63278f9fc241b1 | Bin 0 -> 26 bytes .../89/b24ecec50c07aef0d6640a2a9f6dc354a33125 | Bin 0 -> 22 bytes .../a9/2d664bc20a04b1621b1fc893d1196b41182fdf | Bin 0 -> 29 bytes .../f2/214a28aa9be25c7bf34dc84aa98059728db102 | 4 + .../expected/.git_keep/refs/heads/master | 1 + .../searchingInStagingPanel/expected/myfile1 | 3 + .../searchingInStagingPanel/snapshot.txt | 36 --- .../squash/expected/.git_keep/COMMIT_EDITMSG | 30 +++ .../squash/expected/.git_keep/FETCH_HEAD | 0 .../squash/expected/.git_keep/HEAD | 1 + .../squash/expected/.git_keep/ORIG_HEAD | 1 + .../squash/expected/.git_keep/config | 10 + .../squash/expected/.git_keep/description | 1 + .../squash/expected/.git_keep/index | Bin 0 -> 425 bytes .../squash/expected/.git_keep/info/exclude | 7 + .../squash/expected/.git_keep/logs/HEAD | 10 + .../expected/.git_keep/logs/refs/heads/master | 6 + .../0c/6aed66ccd076086011a0e68bf67e3477cd5e1d | Bin 0 -> 119 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1b/838df93e188ddacfce91d03dfcf1386ca57714 | Bin 0 -> 128 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../30/a1ca3481fdec3245b02aeacfb72ddfe2a433be | Bin 0 -> 154 bytes .../35/bf02987e13a6d711d4279778063e72dd051680 | Bin 0 -> 150 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 0 -> 21 bytes .../51/a88edd955132342caad6512e92d25164b5f7d3 | 2 + .../5e/f618ee84d1fbb6f277996061996ce5ec0faf4e | 3 + .../75/afa841946755c424097363ba4e5682951b02e3 | Bin 0 -> 211 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../ac/0b81af0c436000141d41d6bfbf61fe41567eca | Bin 0 -> 149 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../db/27c30903c7fa6564e9c925097a03b88e6b67e7 | Bin 0 -> 149 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/squash/expected/myfile1 | 1 + test/integration/squash/expected/myfile2 | 1 + test/integration/squash/expected/myfile3 | 1 + test/integration/squash/expected/myfile5 | 1 + test/integration/squash/snapshot.txt | 42 --- 282 files changed, 575 insertions(+), 533 deletions(-) create mode 100644 test/integration/commit/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/commit/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/commit/expected/.git_keep/HEAD create mode 100644 test/integration/commit/expected/.git_keep/config create mode 100644 test/integration/commit/expected/.git_keep/description create mode 100644 test/integration/commit/expected/.git_keep/index create mode 100644 test/integration/commit/expected/.git_keep/info/exclude create mode 100644 test/integration/commit/expected/.git_keep/logs/HEAD create mode 100644 test/integration/commit/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/commit/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be create mode 100644 test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920 create mode 100644 test/integration/commit/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c create mode 100644 test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 create mode 100644 test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 create mode 100644 test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb create mode 100644 test/integration/commit/expected/.git_keep/refs/heads/master create mode 100644 test/integration/commit/expected/myfile1 create mode 100644 test/integration/commit/expected/myfile2 create mode 100644 test/integration/commit/expected/myfile3 create mode 100644 test/integration/commit/expected/myfile4 create mode 100644 test/integration/commit/expected/myfile5 delete mode 100644 test/integration/commit/snapshot.txt create mode 100644 test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/mergeConflicts/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/mergeConflicts/expected/.git_keep/HEAD create mode 100644 test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/mergeConflicts/expected/.git_keep/config create mode 100644 test/integration/mergeConflicts/expected/.git_keep/description create mode 100644 test/integration/mergeConflicts/expected/.git_keep/index create mode 100644 test/integration/mergeConflicts/expected/.git_keep/info/exclude create mode 100644 test/integration/mergeConflicts/expected/.git_keep/logs/HEAD create mode 100644 test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch create mode 100644 test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop create mode 100644 test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking create mode 100644 test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/85/80d8908b1bfc6d71971e73812effa15c68ecf3 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch create mode 100644 test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop create mode 100644 test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking create mode 100644 test/integration/mergeConflicts/expected/.git_keep/refs/heads/master create mode 100644 test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch create mode 100644 test/integration/mergeConflicts/expected/directory/file create mode 100644 test/integration/mergeConflicts/expected/directory/file2 create mode 100644 test/integration/mergeConflicts/expected/file create mode 100644 test/integration/mergeConflicts/expected/file1 create mode 100644 test/integration/mergeConflicts/expected/file3 create mode 100644 test/integration/mergeConflicts/expected/file4 create mode 100644 test/integration/mergeConflicts/expected/file5 delete mode 100644 test/integration/mergeConflicts/snapshot.txt create mode 100644 test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/patchBuilding/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/patchBuilding/expected/.git_keep/HEAD create mode 100644 test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/patchBuilding/expected/.git_keep/config create mode 100644 test/integration/patchBuilding/expected/.git_keep/description create mode 100644 test/integration/patchBuilding/expected/.git_keep/index create mode 100644 test/integration/patchBuilding/expected/.git_keep/info/exclude create mode 100644 test/integration/patchBuilding/expected/.git_keep/logs/HEAD create mode 100644 test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/19/c35a6c6e60aead9beb704c336f95a9c34eb272 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/51/d06e68d1780c3af5ec14e8a8a6250693dea430 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/84/166fe7febd3d82c087a5261a34a5e0dabeebbc create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a create mode 100644 test/integration/patchBuilding/expected/.git_keep/refs/heads/master create mode 100644 test/integration/patchBuilding/expected/myfile1 create mode 100644 test/integration/patchBuilding/expected/myfile2 create mode 100644 test/integration/patchBuilding/expected/myfile3 delete mode 100644 test/integration/patchBuilding/snapshot.txt create mode 100644 test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/patchBuilding2/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/patchBuilding2/expected/.git_keep/HEAD create mode 100644 test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/patchBuilding2/expected/.git_keep/config create mode 100644 test/integration/patchBuilding2/expected/.git_keep/description create mode 100644 test/integration/patchBuilding2/expected/.git_keep/index create mode 100644 test/integration/patchBuilding2/expected/.git_keep/info/exclude create mode 100644 test/integration/patchBuilding2/expected/.git_keep/logs/HEAD create mode 100644 test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/52/863675692b53d9e34dd72da8c35a72bf0a5b51 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/60/39f2c23e9f10c8b11e82639bdceafb795ec7ab create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/8d/d7331351a6d2b809cbab136a83f8c69abb0b4d create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/ce/024fc694fd464cfb5b43cb7702f0bd7345d882 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/d0/15c882b061d63669daf4b25c918c8155d88c66 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a create mode 100644 test/integration/patchBuilding2/expected/.git_keep/refs/heads/master create mode 100644 test/integration/patchBuilding2/expected/.git_keep/refs/stash create mode 100644 test/integration/patchBuilding2/expected/myfile1 create mode 100644 test/integration/patchBuilding2/expected/myfile2 delete mode 100644 test/integration/patchBuilding2/snapshot.txt create mode 100644 test/integration/searching/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/searching/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/searching/expected/.git_keep/HEAD create mode 100644 test/integration/searching/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/searching/expected/.git_keep/config create mode 100644 test/integration/searching/expected/.git_keep/description create mode 100644 test/integration/searching/expected/.git_keep/index create mode 100644 test/integration/searching/expected/.git_keep/info/exclude create mode 100644 test/integration/searching/expected/.git_keep/logs/HEAD create mode 100644 test/integration/searching/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/searching/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/searching/expected/.git_keep/objects/29/cfbab279d8677b1614786c8161d915c3851334 create mode 100644 test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/searching/expected/.git_keep/objects/35/98e6458e34f1a1c51ffbbc3f9073b8dd4694eb create mode 100644 test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/searching/expected/.git_keep/objects/56/a707665291bb59eff01a7c25f14c3e9ad9a28d create mode 100644 test/integration/searching/expected/.git_keep/objects/8e/4d1c97ee8e375b218257ed805954c4508f188a create mode 100644 test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/searching/expected/.git_keep/objects/b5/551403e8d2c3d141e8b4523e4b9892337fec8a create mode 100644 test/integration/searching/expected/.git_keep/objects/c3/53473bb2ef43d48a78ed053bc2e1f280e37215 create mode 100644 test/integration/searching/expected/.git_keep/objects/ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 create mode 100644 test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/searching/expected/.git_keep/objects/e0/f0a11e4de3f37f143b508c0084a4d58a672afc create mode 100644 test/integration/searching/expected/.git_keep/objects/f6/12cb91eecb4ccf9e47dfda31ca63ab700d5383 create mode 100644 test/integration/searching/expected/.git_keep/objects/fc/34f28ab77f236452f97c9cf8fdfe687d23938e create mode 100644 test/integration/searching/expected/.git_keep/refs/heads/master create mode 100644 test/integration/searching/expected/myfile1 create mode 100644 test/integration/searching/expected/myfile3 create mode 100644 test/integration/searching/expected/myfile5 delete mode 100644 test/integration/searching/snapshot.txt create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/HEAD create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/config create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/description create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/index create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/info/exclude create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/logs/HEAD create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/02/64611003567cbe3b08955a8e745786c688ec7a create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/5f/82960be010ac424ab7485684942813aff754e8 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/6b/f2cc26256f2eae6ed4058ce1bc924b84a560f0 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/7b/ba8c8e64b598d317cdf1bb8a63278f9fc241b1 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/f2/214a28aa9be25c7bf34dc84aa98059728db102 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master create mode 100644 test/integration/searchingInStagingPanel/expected/myfile1 delete mode 100644 test/integration/searchingInStagingPanel/snapshot.txt create mode 100644 test/integration/squash/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/squash/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/squash/expected/.git_keep/HEAD create mode 100644 test/integration/squash/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/squash/expected/.git_keep/config create mode 100644 test/integration/squash/expected/.git_keep/description create mode 100644 test/integration/squash/expected/.git_keep/index create mode 100644 test/integration/squash/expected/.git_keep/info/exclude create mode 100644 test/integration/squash/expected/.git_keep/logs/HEAD create mode 100644 test/integration/squash/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d create mode 100644 test/integration/squash/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/squash/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 create mode 100644 test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be create mode 100644 test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680 create mode 100644 test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f create mode 100644 test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 create mode 100644 test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e create mode 100644 test/integration/squash/expected/.git_keep/objects/75/afa841946755c424097363ba4e5682951b02e3 create mode 100644 test/integration/squash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/squash/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca create mode 100644 test/integration/squash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 create mode 100644 test/integration/squash/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/squash/expected/.git_keep/refs/heads/master create mode 100644 test/integration/squash/expected/myfile1 create mode 100644 test/integration/squash/expected/myfile2 create mode 100644 test/integration/squash/expected/myfile3 create mode 100644 test/integration/squash/expected/myfile5 delete mode 100644 test/integration/squash/snapshot.txt diff --git a/.gitignore b/.gitignore index 21ec121da..3e8fd3b92 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,8 @@ lazygit !.github/ test/git_server/data -test/integration_test/ -test/integration_test_config/ +test/integration/*/actual/ +test/integration/*/used_config/ +# these sample hooks waste too space space +test/integration/*/expected/.git_keep/hooks/ +!.git_keep/ diff --git a/pkg/commands/oscommands/copy.go b/pkg/commands/oscommands/copy.go index 2681441c5..131e9bc6b 100644 --- a/pkg/commands/oscommands/copy.go +++ b/pkg/commands/oscommands/copy.go @@ -76,7 +76,7 @@ func CopyFile(src, dst string) (err error) { } // CopyDir recursively copies a directory tree, attempting to preserve permissions. -// Source directory must exist, destination directory must *not* exist. +// Source directory must exist. If destination already exists we'll clobber it. // Symlinks are ignored and skipped. func CopyDir(src string, dst string) (err error) { src = filepath.Clean(src) @@ -95,7 +95,10 @@ func CopyDir(src string, dst string) (err error) { return } if err == nil { - return fmt.Errorf("destination already exists") + // it exists so let's remove it + if err := os.RemoveAll(dst); err != nil { + return err + } } err = os.MkdirAll(dst, si.Mode()) diff --git a/pkg/gui/gui_test.go b/pkg/gui/gui_test.go index ef8ad6dd9..e11151020 100644 --- a/pkg/gui/gui_test.go +++ b/pkg/gui/gui_test.go @@ -81,13 +81,45 @@ func tests() []integrationTest { } } -func generateSnapshot(t *testing.T, actualDir string) string { +func generateSnapshot(t *testing.T, dir string) string { osCommand := oscommands.NewDummyOSCommand() - cmd := fmt.Sprintf(`bash -c "cd %s && git status; cat ./*; git log --pretty=%%B -p"`, actualDir) - // need to copy from current directory to + _, err := os.Stat(filepath.Join(dir, ".git")) + if err != nil { + return "git directory not found" + } + + snapshot := "" + + statusCmd := fmt.Sprintf(`git -C %s status`, dir) + statusCmdOutput, err := osCommand.RunCommandWithOutput(statusCmd) + assert.NoError(t, err) + + snapshot += statusCmdOutput + "\n" + + logCmd := fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir) + logCmdOutput, err := osCommand.RunCommandWithOutput(logCmd) + assert.NoError(t, err) + + snapshot += logCmdOutput + "\n" + + err = filepath.Walk(dir, func(path string, f os.FileInfo, err error) error { + assert.NoError(t, err) + + if f.IsDir() { + if f.Name() == ".git" { + return filepath.SkipDir + } + return nil + } + + bytes, err := ioutil.ReadFile(path) + assert.NoError(t, err) + snapshot += string(bytes) + "\n" + + return nil + }) - snapshot, err := osCommand.RunCommandWithOutput(cmd) assert.NoError(t, err) return snapshot @@ -160,23 +192,46 @@ func Test(t *testing.T) { testPath := filepath.Join(rootDir, "test", "integration", test.name) actualDir := filepath.Join(testPath, "actual") expectedDir := filepath.Join(testPath, "expected") + t.Logf("testPath: %s, actualDir: %s, expectedDir: %s", testPath, actualDir, expectedDir) findOrCreateDir(testPath) - prepareIntegrationTestDir(testPath) + prepareIntegrationTestDir(actualDir) err := createFixture(rootDir, test.fixture, actualDir) assert.NoError(t, err) runLazygit(t, testPath, rootDir, record, speed) - actual := generateSnapshot(t, actualDir) - if updateSnapshots { err = oscommands.CopyDir(actualDir, expectedDir) assert.NoError(t, err) } - expected := generateSnapshot(t, expectedDir) + actual := generateSnapshot(t, actualDir) + + expected := "" + + func() { + // git refuses to track .git folders in subdirectories so we need to rename it + // to git_keep after running a test + + defer func() { + err = os.Rename( + filepath.Join(expectedDir, ".git"), + filepath.Join(expectedDir, ".git_keep"), + ) + + assert.NoError(t, err) + }() + + // ignoring this error because we might not have a .git_keep file here yet. + _ = os.Rename( + filepath.Join(expectedDir, ".git_keep"), + filepath.Join(expectedDir, ".git"), + ) + + expected = generateSnapshot(t, expectedDir) + }() if expected == actual { t.Logf("%s: success at speed %d\n", test.name, speed) @@ -268,7 +323,7 @@ func runLazygit(t *testing.T, testPath string, rootDir string, record bool, spee } // if we're on CI we'll need to use a PTY. We can work that out by seeing if the 'TERM' env is defined. - if runInParallel() { + if runInPTY() { cmd.Env = append(cmd.Env, "TERM=xterm") f, err := pty.StartWithSize(cmd, &pty.Winsize{Rows: 100, Cols: 100}) @@ -286,17 +341,19 @@ func runLazygit(t *testing.T, testPath string, rootDir string, record bool, spee } func runInParallel() bool { - return os.Getenv("PARALLEL") != "" || os.Getenv("TERM") == "" + return os.Getenv("PARALLEL") != "" } -func prepareIntegrationTestDir(testPath string) { - path := filepath.Join(testPath, "actual") +func runInPTY() bool { + return runInParallel() || os.Getenv("TERM") == "" +} +func prepareIntegrationTestDir(actualDir string) { // remove contents of integration test directory - dir, err := ioutil.ReadDir(path) + dir, err := ioutil.ReadDir(actualDir) if err != nil { if os.IsNotExist(err) { - err = os.Mkdir(path, 0777) + err = os.Mkdir(actualDir, 0777) if err != nil { panic(err) } @@ -305,6 +362,6 @@ func prepareIntegrationTestDir(testPath string) { } } for _, d := range dir { - os.RemoveAll(filepath.Join(path, d.Name())) + os.RemoveAll(filepath.Join(actualDir, d.Name())) } } diff --git a/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..fbe803e67 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +my commit diff --git a/test/integration/commit/expected/.git_keep/FETCH_HEAD b/test/integration/commit/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/commit/expected/.git_keep/HEAD b/test/integration/commit/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/commit/expected/.git_keep/config b/test/integration/commit/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/commit/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/commit/expected/.git_keep/description b/test/integration/commit/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/commit/expected/.git_keep/index b/test/integration/commit/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..cfbb26b72dc48b2e025cc8ba0ced6ab04c6145aa GIT binary patch literal 425 zcmZ?q402{*U|<4b*7zE4C(%mVCor0kfq{iJGclEcp>YWV1LIeq8WA97Te|1*U)9tb zUm`-Ic=DYt1bDS{Uu9s=txU_zNi_s20O=Q78nhcmL(Qo{H%Ef!hf#ylzH={EEefyd zZ+WFX-$ET`juF%x@fRWWAag)8)SO;)bM9yJYM&{4_J;qI!Xb45FMo|)N2Foq7(>mG z)T%B6nFFGs=FCGk=aR|M2jTyWj+MPie{tI4OH%Bu*C8--OrYjSWn9bvnFFGs=B!6I z$KNDh>gp~{@mq?Vk6tbMbboi-M}C+&ra*H-f?QpJlq7?xf&rJo!c!)Vf8Q9nZqRyl he!K4dM@x+Nah0uJeyZbvZi0iA!sAYpsw1p|@&G26i0uFX literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/info/exclude b/test/integration/commit/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/commit/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/commit/expected/.git_keep/logs/HEAD b/test/integration/commit/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..a61e86c36 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 f4473317f8385f84b8054f3e9e9895870aa339bb CI 1601981250 +1100 commit (initial): myfile1 +f4473317f8385f84b8054f3e9e9895870aa339bb 60100545975af038486a0265a786b78c090faa4c CI 1601981250 +1100 commit: myfile2 +60100545975af038486a0265a786b78c090faa4c 7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 CI 1601981250 +1100 commit: myfile3 +7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 dcb4d7ccb176a17a6ddc2e1a402a28f055947393 CI 1601981250 +1100 commit: myfile4 +dcb4d7ccb176a17a6ddc2e1a402a28f055947393 459260de735f85c64517eef30e6a2d2236f3f920 CI 1601981254 +1100 commit: my commit diff --git a/test/integration/commit/expected/.git_keep/logs/refs/heads/master b/test/integration/commit/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..a61e86c36 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 f4473317f8385f84b8054f3e9e9895870aa339bb CI 1601981250 +1100 commit (initial): myfile1 +f4473317f8385f84b8054f3e9e9895870aa339bb 60100545975af038486a0265a786b78c090faa4c CI 1601981250 +1100 commit: myfile2 +60100545975af038486a0265a786b78c090faa4c 7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 CI 1601981250 +1100 commit: myfile3 +7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 dcb4d7ccb176a17a6ddc2e1a402a28f055947393 CI 1601981250 +1100 commit: myfile4 +dcb4d7ccb176a17a6ddc2e1a402a28f055947393 459260de735f85c64517eef30e6a2d2236f3f920 CI 1601981254 +1100 commit: my commit diff --git a/test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/commit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/commit/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/commit/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/commit/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be new file mode 100644 index 0000000000000000000000000000000000000000..aca754d63288ea16d4cd69754eac3b0cba133abe GIT binary patch literal 154 zcmV;L0A>Gp0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR~Cjm@@dA{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c b/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c new file mode 100644 index 000000000..b6365c94e --- /dev/null +++ b/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c @@ -0,0 +1,2 @@ +xM +0@a9Ed7 "tc$ -%[immٟ.bK"%<(GZ#bc4[խz0i4!x%a!'(k5n^.Ҷ\,F@3"91OnW8v9w \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 b/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 new file mode 100644 index 000000000..7359cf0a9 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 @@ -0,0 +1,2 @@ +xM +0F] 2M@DǘN3X0z{sW<OZf1S;JÌ E\;*/@hv8H+|W S`G"'s" =Îӽ|r,H&3鴟jOԯ9 \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commit/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/commit/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/commit/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 b/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 new file mode 100644 index 0000000000000000000000000000000000000000..e288012fb10ed3c72f18554929ae6abf2a4b77f3 GIT binary patch literal 150 zcmV;H0BQet0gcX03c@fDKw;N8MfQTsWHR{y5uvLdBONDLXlyAF^!D}$ZXe&`$=cf7 zEoOh}yQ+0HVD!L12|T5We!>tq72=>VI8Q8vGn%dJ`sy}H5-J2WMw-&YvD7?qWfiH4 zlb4ztLCB`O`*YpxFxu-d-t|-3w&+FHcC#1&b3(^p&xio#sK->-Ke=h&Ixp(Y4;+p; EQRrbwwEzGB literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/commit/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb b/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb new file mode 100644 index 0000000000000000000000000000000000000000..156705abbadf6f782986ee6b8078790e07aa2c2d GIT binary patch literal 119 zcmV--0Eqv10ga783WG2Z0DI0W_FgEvc3mTsB6#u{G1*YTB}Gzbe{Y`9>oCK_VzyNv zmP#-Cl#oU0c?)p#$p%^HSaJ{=JBJNX9O{? zP}pGWd7yb<8e(3$9GZF3;#LlCBOV(hh~=FAUCVQZxqV+eCj$%2RZw?Xu80S_3rIuV zbp+KM#+*BsJp!s1-s(@O+<7zQ)?%hjzvs?jU z7n9q<{=%So_VG&PeHAAe9s2Vi<`^T)ah~-I>>eNuHRl-d=9nPN$*X{bH;{&!bAott zOu^=a1i88b8P*Ku3Wi)C-Hw0XQBvL`b>aN1*H7XOIn~rYf=3O5k%9r&=kH1DT{PEq z{^DI{%M~5Kvrx?7NRVqNC|QMp1KrTTz|6#i0hNkfa#MjNJVduW{>i9FhG+<7w{&5eF7yOXeXBeuv?-KWafxuxY& 1601981290 +1100 commit (initial): first commit +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from master to feature/cherry-picking +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year +02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh +f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh +4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool +4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice +223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha +b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah +bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 checkout: moving from feature/cherry-picking to develop +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop +27bff1745d1ab39754071c9b225971867ea2a8a8 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from develop to master +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master +07392b739784503a325278fedf5251ecb7c3bca9 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 checkout: moving from master to develop +27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop +6573f823441ea560245f56e735d7cbc972607341 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 checkout: moving from develop to master +07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master +a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 checkout: moving from master to develop +6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop +de8c7134958792e1bff9b33cca090287def37f7e a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 checkout: moving from develop to master +a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master +d09f332ddbdbb1d516ca99da33b23f987e4c13c3 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 checkout: moving from master to develop +de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop +149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 checkout: moving from develop to master +d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master +e217a1e8fe2e038fdc59202dee120f081ecf458f e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 checkout: moving from master to base_branch +e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file +8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch +8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from other_branch to base_branch +8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed +4a5f9db9c8d46ac099de054e42e17a157ee3909b 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch +8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd +659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch new file mode 100644 index 000000000..383150856 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 branch: Created from HEAD +e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file +8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop new file mode 100644 index 000000000..439b9c700 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 branch: Created from HEAD +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop +27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop +6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop +de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..a61959de7 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 branch: Created from HEAD +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year +02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh +f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh +4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool +4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice +223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha +b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah +bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..427cc86bd --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 commit (initial): first commit +705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master +07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master +a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master +d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..4e8ffd4f8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 branch: Created from HEAD +8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd +659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 b/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 new file mode 100644 index 000000000..6a17c763e --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 @@ -0,0 +1,3 @@ +x +0=+.nZD +Jo:ĵk#+ݮU,bD}o{pu\Ь:Vy>) ԱN{$k F_mY+M3 3c#^ltjS7Z~RNh5_$PD \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 b/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 new file mode 100644 index 0000000000000000000000000000000000000000..46101849dc9afbfa07d8207d2eb965e98e1e4d26 GIT binary patch literal 157 zcmV;O0Al}m0gaA93c@fD06pgwdlzIkNs}yy2tD-~+h&6WV@n&s=UeatUWXZ&X{mK? zV3AL4Q-!WL^&O|t2Vt@W3wPoZr|6w>War(KY;k6lOH~-1Q@Med=Xe>J2C$aU#nIXCg#%&||9UpSmgYwm0}yu)Ltk Le#GVrLAgKc3u#5C literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflicts/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d new file mode 100644 index 0000000000000000000000000000000000000000..8d42c4c9e2f8c317030a30193aef9945f0c8afa2 GIT binary patch literal 112 zcmV-$0FVE80V^p=O;s>7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 b/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 new file mode 100644 index 0000000000000000000000000000000000000000..2a5841f73491c7c0b6f4342d92b2f7f0bb8e9a3f GIT binary patch literal 157 zcmV;O0Al}m0gaA93d0}}0DJZodoL7MZB;0xkW-$a>q-hS1~H}2uh0+lI?TXOE#=ig zA)b0;1`feEipV+{%NSjBDH|ITDdX6CRMHaZB=*pF>yX%yMQ!}mS+7QrvyWO61?i=7 zHgVQATNdHyOKmXCaG&NUe?r+;zECX>z?($xPL%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkxQPJ}D5PW-r6!l;7gaJOOuWvysr0#!pe$qVY%BjQe#sxdK}}1`%t~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflicts/expected/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 new file mode 100644 index 0000000000000000000000000000000000000000..9b8af5fe783f2a13adddbc268c1af837ab15412a GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Gli0j#1aKh^<0JY{LH*` Yg_3-Q7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b new file mode 100644 index 000000000..fe80a0056 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b @@ -0,0 +1,5 @@ +xK +0@]d&M& ]L`M)=/ܖA9M9%c5Z +UKlZ& +:REr _ &;' \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflicts/expected/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 new file mode 100644 index 0000000000000000000000000000000000000000..1cafb95f9172da116f05816fbf223f92099aebbf GIT binary patch literal 144 zcmV;B0B`?z0V^p=O;s>5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^REF3kHx*dILv-8YpWOTEb+SjySa$=GydlG#%N_yM3vczORPMZ) ya%(Zurr&etASp0rc)Ttqw}t(MLG|q8mCE}nPBJ?5=OHODA*8?*s{#O;Tv8UZnMM@= literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflicts/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af new file mode 100644 index 0000000000000000000000000000000000000000..27c11bb26067e0a43b68d14777da3f61ddfcceac GIT binary patch literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a b/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a new file mode 100644 index 0000000000000000000000000000000000000000..749db6230b9a4e8a1a8da4f45ea7c28ab7465ea2 GIT binary patch literal 154 zcmV;L0A>Gp0gaAJ3c@fDKwak)vlnD0za}6ebk$=dlL;-Dwv-4S-+~u#`*;r?Z>=pI zG}=o)M8J4KsYaY;FFK01F(40Aq~?@8dRuf!fz_T4Svy!U)x?rnLSh`UJC)#y)@ATS zCPZgb@HVOR?(=rQIKh3Kp7Kd;f60xv_5kuoF_4Z3S0Y4p(sQcIpSr3`?KAu;SQi%c I1#N{sF?DK0rT_o{ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflicts/expected/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 new file mode 100644 index 0000000000000000000000000000000000000000..99177464395aa927a36557643ce3e4e536679578 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>ONEk*#1aKh^<0JY{LH*` Yg_3-Q4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q65Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0b7+cS1WIcHNshZ>FQU(XVB964q`+k~d_ybJ-)Hdf~19l**kq zQ*JG0+Vp$w93%zC43F2vxu6VrM4t zI)s=RS-Yg-t367EVT9{2-sKb5eUS^7^#7HD)k0FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^Z_#007vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0y9GGs6`FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7jvWBSN{0B< C>3I79 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b b/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b new file mode 100644 index 000000000..4a8334d3f --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b @@ -0,0 +1,3 @@ +xK +0@]$ ]db C>ރ'۲ 0K;TB2'bTԘ4Uw$Tԙ=6mh9c +a$T֚*3Ӧa0>7ٖ` Z"ZkNzN5S7u~+Ȕ֗j< \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 new file mode 100644 index 0000000000000000000000000000000000000000..898b64daddb17659fcf19eb7cdb318a292c10037 GIT binary patch literal 154 zcmV;L0A>Gp0gaA93c@fD06pgwdlzK0X_FR2gr540&F+>KtSvEu&$r+Qybd!kvaRb< zfv`Q*Vg}lAk``4sHVwC7@TFGk zYe)stWprkl$tkiq+Y*V$kn*5OCvTn6j-p3G3V}fE)cHN6$sP+w6{6P>Nm)0U48?db z$`R_E*aR#_&@tB5<-ExIygd0sb>H}wT75{gfWe~*Ag_o3;-u%P!GG$aw4;wz{<3r0 JCcd_uKF~|WPMrV% literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 new file mode 100644 index 000000000..e0670d284 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 @@ -0,0 +1 @@ +x 0CvL\jVОW=M4g3%pYvzD&lvWcY&Pr_@JZHVP-@|e008rm4L|?@ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflicts/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 new file mode 100644 index 0000000000000000000000000000000000000000..27ac61738744e4923b0d928f7521dd5707074712 GIT binary patch literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflicts/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 new file mode 100644 index 0000000000000000000000000000000000000000..bfb5376c67ba79deb64b9463958ebd99b0ed9f64 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflicts/expected/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 new file mode 100644 index 0000000000000000000000000000000000000000..236b6cdf4f4a62168a2e0b0b9b49cdcdbc22c808 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Lxqxz#1aKh^<0JY{LH*` Yg_3-Q5Oi(bk)CeBm9>MM7J$StK{umn2 zoW?GqZ9?w>h*C+ec;A9^t>kFA7ObUJa2zUHwb3rGp>xQlW;D4#X&h?;Od!c+u+kbq z;FyJ*Q}h}4b=UKvr+K-_m-_aU3$OjEAsWCVK&Q_D#;AiHQ$zmL6}_wa0shH30at=a ASO5S3 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 b/test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 new file mode 100644 index 0000000000000000000000000000000000000000..7079847c8ef5a839533e09951fb23a769d456402 GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlw{I(=`E+LQj3hHr>U7AtkQR=UeatUWXYb*HTsk z?D1qx1SAmA%v}nRXz4SOCRUj4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6)pd#Os`!N}me}$};B8w({TNm;CV?)U>qBoK!=Gj>B{A aXr7$<M%sOlbDTß{9 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflicts/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d new file mode 100644 index 0000000000000000000000000000000000000000..d63de558bc9f6f0096d5c3091fc31b9d8b2630eb GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>BZZQT#1aKh^<0JY{LH*` Yg_3-Q4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do(7VkpVTELH%bw9K4Tg}l<-q|_n>3x$%5#1aKh^<0JY{LH*` Yg_3-Q8G-fa~FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm|#@^04{ye Es|G`_Y5)KL literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflicts/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 new file mode 100644 index 0000000000000000000000000000000000000000..ffc277c86c56c088175e46f1590082f30deb89cd GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsu M2j- g&s*ۣ0Np|R^rZn@)LO5Wp]giPW(FQ? \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflicts/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflicts/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c new file mode 100644 index 0000000000000000000000000000000000000000..7302ca34e9d34bcda37b5a408f6b509933d555f2 GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Q-zX@#1aKh^<0JY{LH*` Yg_3-QGp0gaA93c@fDMP26<*$Xn0q{#$CgsyswX*wZ-v86`n@eOzZxBtBdKdrSs znl|80Z5PoAmj#`7!Lwr^zX#c$ZfXjb)QKXMmUzIx}aEol}h7 zau^Z;I3ZU2X=UB@IO*#+-R0oAJ>`7VkpVTELH%bw9K4Tg}l<-q|_n>6NQqD#1aKh^<0JY{LH*` Yg_3-Qb%7 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 b/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 new file mode 100644 index 000000000..7b80aff0d --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 @@ -0,0 +1,4 @@ +xK +0@]d&i~ "t1&Ʉ +ƖEoo }/ϭ];ht@Ak<&$RSHKѨWwHYeśl)⬡m &CFO +,onMyn' 鈰'BTݦ ~|' > \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflicts/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 new file mode 100644 index 0000000000000000000000000000000000000000..008bb1a6567766c154b88180e8aa85b15392362c GIT binary patch literal 277 zcmV+w0qXvE0V^p=O;s>9GiER}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7i&B$I@{1}N5++{f+*JBpNKlqBcea)P7Qf_=-=L4Fl8__FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMIIe0T3vpWEQ0+m*f{!G9*mA&bg`d zxsaeNWA1D#|1EyWAHP9OOUukjHDu^GJm-$)$*DgcF0(o7@qG8Sn>jmn003Pvs7;ya BlW+h4 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 new file mode 100644 index 000000000..6955a6f9c --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 @@ -0,0 +1,4 @@ +xM +0a9@DǘZ0߂p>ֵtM4%84D]DO6\MXgLC> N +c +.bƚ5F]>\\Vo@)E L8\em3lO:-?/ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflicts/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 new file mode 100644 index 0000000000000000000000000000000000000000..198bff1ec786820e0c2f41db6e2bed90f1e103fa GIT binary patch literal 201 zcmV;)05<=40V^p=O;s>5HfJz2FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRl&pn2ozE>i&B$I@{1}N5++{f z+*JBpNKlqBcea)P7Qf_=-=L5w`4FhFfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GxD20);Yl3A3RT#{c@$&fJdI_IX+=R$(AjJdO|{I~cefBXhDEiE%A)sUg% d@SHoEC#U{+xXk9P$MfCSZszRR0RVyibtbb-a`^xN literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a new file mode 100644 index 0000000000000000000000000000000000000000..4cf8403952e666ce7648bd4e341cc6c34910f67b GIT binary patch literal 65 zcmV-H0KWft0ZYosPg1ZnWw3z&1rJw87p}b2a-*2M{G!bC%)G=LB&IQ!Ed+p+7~)W3 X2LTF6iN&e$Nkxfy$r)S#lwToO&X63b literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c new file mode 100644 index 000000000..74c919681 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c @@ -0,0 +1 @@ +x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e b/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e new file mode 100644 index 000000000..a80770449 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e @@ -0,0 +1,2 @@ +xK +0@]d&i@DH)-M Q</Tmi /@p!s$̑))HlGьv2XeoZ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflicts/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f b/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f new file mode 100644 index 0000000000000000000000000000000000000000..3ed017b564ff7c07c9cccf1691360ebfef603e79 GIT binary patch literal 157 zcmV;O0Al}m0gaA93d0}}0DJZodoL7M6BD77LQZ+cx~`;9Yp@3T{0jX*ufq%smz*CB z4C+&>B47ue26QNryqgpI5jo+cNh2njDI|$8a8x^0c{PaICu>b-F$9bwIwtQUSsRQ^ zex77tv}_d}Z7UU)6|T#Amk;IrDHksJ2Iw^U8I9L)M$}q$+NYZQsjF0u+BW!QP+pMf L-D~v)k-7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflicts/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 new file mode 100644 index 0000000000000000000000000000000000000000..714e20cb7eb8a76c9832939c1e2a103d78bb257d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>bA^(O#1aKh^<0JY{LH*` Yg_3-Q>!qSWM){Gv*Rgo)QVH8F=H?^FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm=IE6id6vs H4=>-(3qr6K literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflicts/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 new file mode 100644 index 0000000000000000000000000000000000000000..4992422c7407bf6efc09d23127726c19cec1119d GIT binary patch literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>V}+88#1aKh^<0JY{LH*` Yg_3-Q:/x<ۗlw{ж=&zD >X3]v]^ hjM߻V \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflicts/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 new file mode 100644 index 0000000000000000000000000000000000000000..3688d63f9f90630dac6d6f55486eb6b86e8e342a GIT binary patch literal 144 zcmV;B0B`?z0V^p=O;s>5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0eS?hqn=r4HCq1PXDguIm6t(FP;-g-jLzWWsiXBg}3@sDtF#Y yxwV*S)9<-+kQ5j*JYE-*+rs|BpnCT4O67eOCm9|3^N@@RRI7%&rx)LLPgyG literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 new file mode 100644 index 0000000000000000000000000000000000000000..e9f9f0881a1460f9b019818b1cbd6e4f67fe70aa GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6ZbrQLc@`W;jN4S literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch new file mode 100644 index 000000000..11226b7e8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/base_branch @@ -0,0 +1 @@ +4a5f9db9c8d46ac099de054e42e17a157ee3909b diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop new file mode 100644 index 000000000..78c028d95 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/develop @@ -0,0 +1 @@ +149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..d255de7e2 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/feature/cherry-picking @@ -0,0 +1 @@ +1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..29c7a8be1 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +e217a1e8fe2e038fdc59202dee120f081ecf458f diff --git a/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..13d445aa4 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +ed21fe1044b8600683ec6c2abbf86195a4d55461 diff --git a/test/integration/mergeConflicts/expected/directory/file b/test/integration/mergeConflicts/expected/directory/file new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/mergeConflicts/expected/directory/file @@ -0,0 +1 @@ +test3 diff --git a/test/integration/mergeConflicts/expected/directory/file2 b/test/integration/mergeConflicts/expected/directory/file2 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/mergeConflicts/expected/directory/file2 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/mergeConflicts/expected/file b/test/integration/mergeConflicts/expected/file new file mode 100644 index 000000000..173a40ed5 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file @@ -0,0 +1 @@ +new1\noriginal2\noriginal3 diff --git a/test/integration/mergeConflicts/expected/file1 b/test/integration/mergeConflicts/expected/file1 new file mode 100644 index 000000000..dcd348507 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file1 @@ -0,0 +1,63 @@ +Here is a story that has been told throuhg the ages +once upon a time there was a cat +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +once upon a time there was another cat diff --git a/test/integration/mergeConflicts/expected/file3 b/test/integration/mergeConflicts/expected/file3 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file3 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflicts/expected/file4 b/test/integration/mergeConflicts/expected/file4 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file4 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflicts/expected/file5 b/test/integration/mergeConflicts/expected/file5 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/file5 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflicts/snapshot.txt b/test/integration/mergeConflicts/snapshot.txt deleted file mode 100644 index 64d10d668..000000000 --- a/test/integration/mergeConflicts/snapshot.txt +++ /dev/null @@ -1,241 +0,0 @@ -On branch other_branch -nothing to commit, working tree clean -cat: ./directory: Is a directory -new1\noriginal2\noriginal3 -Here is a story that has been told throuhg the ages -once upon a time there was a cat -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another cat -once upon a time there was a horse -once upon a time there was a horse -once upon a time there was a horse -Merge branch 'base_branch' into other_branch - -asd - - -diff --git a/file b/file -index 5da4d92..2410ee1 100644 ---- a/file -+++ b/file -@@ -1 +1 @@ --original1\noriginal2\noriginal3 -+new2\noriginal2\noriginal3 -file changed - - -diff --git a/file b/file -index 5da4d92..173a40e 100644 ---- a/file -+++ b/file -@@ -1 +1 @@ --original1\noriginal2\noriginal3 -+new1\noriginal2\noriginal3 -file - - -diff --git a/file b/file -new file mode 100644 -index 0000000..5da4d92 ---- /dev/null -+++ b/file -@@ -0,0 +1 @@ -+original1\noriginal2\noriginal3 -fourth commit on master - - -diff --git a/file5 b/file5 -new file mode 100644 -index 0000000..e3ae5c6 ---- /dev/null -+++ b/file5 -@@ -0,0 +1 @@ -+once upon a time there was a horse -third commit on master - - -diff --git a/file4 b/file4 -new file mode 100644 -index 0000000..e3ae5c6 ---- /dev/null -+++ b/file4 -@@ -0,0 +1 @@ -+once upon a time there was a horse -second commit on master - - -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..e3ae5c6 ---- /dev/null -+++ b/file3 -@@ -0,0 +1 @@ -+once upon a time there was a horse -first commit on master - - -diff --git a/directory/file b/directory/file -index a5bce3f..df6b0d2 100644 ---- a/directory/file -+++ b/directory/file -@@ -1 +1 @@ --test1 -+test3 -diff --git a/directory/file2 b/directory/file2 -index a5bce3f..df6b0d2 100644 ---- a/directory/file2 -+++ b/directory/file2 -@@ -1 +1 @@ --test1 -+test3 -diff --git a/file1 b/file1 -index 88c39cd..dcd3485 100644 ---- a/file1 -+++ b/file1 -@@ -1 +1,63 @@ - Here is a story that has been told throuhg the ages -+once upon a time there was a cat -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+... -+once upon a time there was another cat -first commit - - -diff --git a/directory/file b/directory/file -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/directory/file -@@ -0,0 +1 @@ -+test1 -diff --git a/directory/file2 b/directory/file2 -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/directory/file2 -@@ -0,0 +1 @@ -+test1 -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..88c39cd ---- /dev/null -+++ b/file1 -@@ -0,0 +1 @@ -+Here is a story that has been told throuhg the ages diff --git a/test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/patchBuilding/expected/.git_keep/FETCH_HEAD b/test/integration/patchBuilding/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/patchBuilding/expected/.git_keep/HEAD b/test/integration/patchBuilding/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..b4ae72d05 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +84166fe7febd3d82c087a5261a34a5e0dabeebbc diff --git a/test/integration/patchBuilding/expected/.git_keep/config b/test/integration/patchBuilding/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/patchBuilding/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/patchBuilding/expected/.git_keep/description b/test/integration/patchBuilding/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/patchBuilding/expected/.git_keep/index b/test/integration/patchBuilding/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..2a202a2bdf5a567abad4c91f981cb6b6880d900d GIT binary patch literal 281 zcmZ?q402{*U|<4b=J* 1601981264 +1100 commit (initial): myfile1 +19c35a6c6e60aead9beb704c336f95a9c34eb272 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981264 +1100 commit: myfile2 +2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981264 +1100 commit: myfile2 update +84166fe7febd3d82c087a5261a34a5e0dabeebbc abe7653e9667153c8086f477217f8fb571731132 CI 1601981264 +1100 commit: myfile3 +abe7653e9667153c8086f477217f8fb571731132 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981269 +1100 rebase -i (start): checkout 2322f6373956d9d54470640e71ff258d609c61bd +2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981269 +1100 rebase -i: fast-forward +84166fe7febd3d82c087a5261a34a5e0dabeebbc ac3b4dc17422ff4d64f08195e8d6fae5f61d213f CI 1601981270 +1100 commit (amend): myfile2 update +ac3b4dc17422ff4d64f08195e8d6fae5f61d213f a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (pick): myfile3 +a296781a25a5bd97a0024744488d9ba39189bf19 a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (finish): returning to refs/heads/master +a296781a25a5bd97a0024744488d9ba39189bf19 51d06e68d1780c3af5ec14e8a8a6250693dea430 CI 1601981271 +1100 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..e30bae310 --- /dev/null +++ b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 19c35a6c6e60aead9beb704c336f95a9c34eb272 CI 1601981264 +1100 commit (initial): myfile1 +19c35a6c6e60aead9beb704c336f95a9c34eb272 2322f6373956d9d54470640e71ff258d609c61bd CI 1601981264 +1100 commit: myfile2 +2322f6373956d9d54470640e71ff258d609c61bd 84166fe7febd3d82c087a5261a34a5e0dabeebbc CI 1601981264 +1100 commit: myfile2 update +84166fe7febd3d82c087a5261a34a5e0dabeebbc abe7653e9667153c8086f477217f8fb571731132 CI 1601981264 +1100 commit: myfile3 +abe7653e9667153c8086f477217f8fb571731132 a296781a25a5bd97a0024744488d9ba39189bf19 CI 1601981270 +1100 rebase -i (finish): refs/heads/master onto 2322f6373956d9d54470640e71ff258d609c61bd +a296781a25a5bd97a0024744488d9ba39189bf19 51d06e68d1780c3af5ec14e8a8a6250693dea430 CI 1601981271 +1100 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 b/test/integration/patchBuilding/expected/.git_keep/objects/01/5689313279311c9356ea3fd3628f73ca4ea797 new file mode 100644 index 0000000000000000000000000000000000000000..4854085f468665b4187f73ee209dcd4d870a069e GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tNceUCcJI>UdugL)bV<8>{=HMc{ literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/patchBuilding/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmboCK_VzyR5 z;!8bL!7In?g_nNNkcbomr+}Sc?rEWWV#*R9os&;}mjk95p40r&Q*7V#7K@F5>~Uxf Z6I>C!ca645)jxG--@I;$?gucZEXBJ!II{o% literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd b/test/integration/patchBuilding/expected/.git_keep/objects/23/22f6373956d9d54470640e71ff258d609c61bd new file mode 100644 index 0000000000000000000000000000000000000000..b65def31c1eff16cb82db1d8d96b0bf1e7af47a3 GIT binary patch literal 149 zcmV;G0BZku0gaAL3c@fDMqTF=*$XoHn}4`q-`o_f)hI({QM2GafBHeftX56oIKcU4A$sq zSj$O!E$G!B+aae}UZ?raZ)*F>m%O!`R0t{trP0c>QUGGmajNs5xoDrdtgOWs3FJDO Dwd+Lc literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 b/test/integration/patchBuilding/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 new file mode 100644 index 0000000000000000000000000000000000000000..5b95c00396c4b9b108a0376c45fe5107f9d1e493 GIT binary patch literal 41 xcmbX$+mfp#eXS|y9HMRxMB`?~vS_Tx0)^eb(9>Lsu3>Tv+%gn`hX5dqv$k15kXxifv6`vKxRIF^Gp0gaAJ3c@fDKwak)*$Xn6OePJ82wn9U`Ao3T*iur^+uI|!eY^)RudU5p zBbZCyMRXQGs+j}TLQJ_Pm&oSiJz#}Yyd_tL0o4|Fd7q(0tZcmvj!P(x$O99IH?^W0 z3PZ?jQc>~fuXWesr0?VOluvBiBDcJ@hc*l*3)ffPE(sQcIpSo(_Ixm9y*h=i8 Iejpk=COz~>vH$=8 literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 b/test/integration/patchBuilding/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 new file mode 100644 index 0000000000000000000000000000000000000000..449805fe8d0cc3998bf4327d616d6a48159fad1e GIT binary patch literal 41 xcmbX$+mfp#eXS_`xY5Dn{JMYc7ai^D&QMZB)gG?8n4gg@550wA_ literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 b/test/integration/patchBuilding/expected/.git_keep/objects/a2/96781a25a5bd97a0024744488d9ba39189bf19 new file mode 100644 index 0000000000000000000000000000000000000000..60be6d23072a2ae96c74fc81cba5fc373aed6494 GIT binary patch literal 154 zcmV;L0A>Gp0e#L*3c@fDKw;N8MfQTsWYYYAh|pD!k!B`XXlw})^!9e)+U?_8yu8)A zbdAxTdK1w?gfIX($}+=@h9iSDLO%G&AsP7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#E;CW>%W19ene#?{(c3hog%2b43TDC^2TZpUta%rtH}p{!`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 b/test/integration/patchBuilding/expected/.git_keep/objects/ab/e7653e9667153c8086f477217f8fb571731132 new file mode 100644 index 0000000000000000000000000000000000000000..0f1f37286b5f9c5eba5d06e7c3ffaf8dc774271d GIT binary patch literal 150 zcmV;H0BQet0gcW}3c@fHMq$TUMdpIso1}Swh|p1&ahv?Xg0ZDU(B0c5I6ZuWlh@Xk zt~t3=-vKSw)I?Hh0I0GPSR%NTON}9yGQ}W+@hsNK z04g#A^PH8u`(xepIO*#+-SLsOJ#oovyJ_~sDYEfSpP7l&QIDyPKe=k(x;$ak4@l}e EFSTP%%>V!Z literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f b/test/integration/patchBuilding/expected/.git_keep/objects/ac/3b4dc17422ff4d64f08195e8d6fae5f61d213f new file mode 100644 index 0000000000000000000000000000000000000000..30cb044bf31246e657085f705e0be4fcddab8183 GIT binary patch literal 158 zcmV;P0Ac@l0ey}^3c@fDMP26<*$Xn0NhS@52wn9UF_~bYv8AM-w>JydZrJ^*HJ4INjwP>$b=xt@Wmn0mFcXtv(|HsJ`~7CjWI0KV8*NnHMqo M*m7*5zDmS94qVwwo&W#< literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 b/test/integration/patchBuilding/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 new file mode 100644 index 0000000000000000000000000000000000000000..4b5b62ee96692a48251a54a27956bb9022430efb GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tAU@$Z=Ff%bx$gNDv%t>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 b/test/integration/patchBuilding/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 new file mode 100644 index 0000000000000000000000000000000000000000..a71694532131dddcef3f2ab3d4e802250e4e4bc2 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#MGc#kPHV-}_X~_jk409y`v|ov+D(qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8USYDD;;DzG6?_x literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a b/test/integration/patchBuilding/expected/.git_keep/objects/f3/c8a074e65b02d1bc364caf0b4c1516abf9eb5a new file mode 100644 index 0000000000000000000000000000000000000000..50c8c7bdcad292142ea81d4faf077667cfc702df GIT binary patch literal 39 vcmb>5g=w;y65p<)zlkb zB0{5h@|`XOc(rt2Wnj;(Ov}tkH3TXE>QCl5x@jJahMIE)%^Zcv({5ZiQkW(b{_S9n zWVoxQ(1BxLVdfYC%?Sx|bp=wA3`PnDT=AjdU(ZM%TyS8UxNEnWlUbII`mVD7%6h)d Ti=RxFTzzL|;kKpbM#VP(qH{%D literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/info/exclude b/test/integration/patchBuilding2/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/patchBuilding2/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/patchBuilding2/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..7bd0ac678 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 CI 1601981272 +1100 commit (initial): myfile1 +e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981272 +1100 commit: myfile2 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 8dd7331351a6d2b809cbab136a83f8c69abb0b4d CI 1601981272 +1100 commit: myfile2 update +8dd7331351a6d2b809cbab136a83f8c69abb0b4d 01287c3b620e4e8db2cef27436347eb4a92e0d56 CI 1601981272 +1100 commit: myfile3 +01287c3b620e4e8db2cef27436347eb4a92e0d56 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981275 +1100 reset: moving to eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981278 +1100 reset: moving to HEAD +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 d015c882b061d63669daf4b25c918c8155d88c66 CI 1601981288 +1100 commit: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..319c6e78e --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 CI 1601981272 +1100 commit (initial): myfile1 +e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981272 +1100 commit: myfile2 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 8dd7331351a6d2b809cbab136a83f8c69abb0b4d CI 1601981272 +1100 commit: myfile2 update +8dd7331351a6d2b809cbab136a83f8c69abb0b4d 01287c3b620e4e8db2cef27436347eb4a92e0d56 CI 1601981272 +1100 commit: myfile3 +01287c3b620e4e8db2cef27436347eb4a92e0d56 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981275 +1100 reset: moving to eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 +eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 d015c882b061d63669daf4b25c918c8155d88c66 CI 1601981288 +1100 commit: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash new file mode 100644 index 000000000..f0e954b6c --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f0e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e CI 1601981278 +1100 On master: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 b/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 new file mode 100644 index 0000000000000000000000000000000000000000..feb982d8694ccba7d6c11c27b5c0c37781506025 GIT binary patch literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQTsWYSCmB7&M??U#*L`Z}pWO6sTOLa02L=2( Em=mBzLjV8( literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/patchBuilding2/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmbAU@$Z=Ff%bx$gNDv%tm(Om${jSJ?z}e6!&z%YbGp0gcX03c@fDKw;N8#q0%{{7q625xVLzlF0-MjV&bwy}dnx+sC(fytX!X zFsLtm7XcPDt}+d-7DtY2_Ssp^A)u+4OR&zD7>(M}F7FPKN!X`~g=}#`SlDtbgh*s4 zMf4g2N>u6SuXTrUg8Mi<<&)aB$c@+b08OZes7)|%)f!Qq^_=SRCs*xT=S2)0TS;Bi I52ofk`$7jvr~m)} literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 b/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 new file mode 100644 index 0000000000000000000000000000000000000000..449805fe8d0cc3998bf4327d616d6a48159fad1e GIT binary patch literal 41 xcmbX$+mfp#eXS_`xY5Dn{JMYc7ai^D&QMZB)gG?8n4gg@550wA_ literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 b/test/integration/patchBuilding2/expected/.git_keep/objects/a3/2f90adf7ee0f14ae300e49cdf8779507746c27 new file mode 100644 index 0000000000000000000000000000000000000000..e75108b148bc6f181734e1c850fb34b46e716f3c GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#E;CW>%W19ene#?{(c3hog%2b43TDC^2TZpUta%rtH}p{!`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 b/test/integration/patchBuilding2/expected/.git_keep/objects/ad/e030587c8ae5d240ad7669bff9030b24bd6385 new file mode 100644 index 0000000000000000000000000000000000000000..4b5b62ee96692a48251a54a27956bb9022430efb GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tAU@$Z=Ff%bx$gNDv%t>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 b/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 new file mode 100644 index 0000000000000000000000000000000000000000..5452038f99f4f52d702bd0b17c395512eb9fd9e3 GIT binary patch literal 119 zcmV--0Eqv10ga783d0}}0DJZodoPq-yIl>GP{=9IFuKw}#1Jf`zpqc|b(mpdEoE&$ zESGku0;jBdY&uMeOXgckarhn?DeDk^~nIAA%EW;wPHje-R literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 b/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 new file mode 100644 index 0000000000000000000000000000000000000000..ab2a044f347a70f28dd54e1d8d57851c0b4e0b5b GIT binary patch literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$Xl=&8Gnop{pKal9^z^*is_s?d=iVzV{ZdtgS8G zVsfXxt6CO?0sI)t$m)e0u*48jt~DJZlgko@(VLBTeRZoTRH;Qu$dW-LsuKVppVTKV z6#PIM84bVtW8LjE+v_yn^}}s@>ZPphW-$P!5h;>ABLbL%9#dWa%uV~&<*8(TDrP#w DQ1wRY literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e b/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e new file mode 100644 index 000000000..b18a466b8 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e @@ -0,0 +1,2 @@ +x=j1@{ a7` \ ш"Y{i_tg673PCRE%I *9(-_nu2McТ6 ʍ zzC?sZ@#H&Q2=Hp@zRJL!TbY)blWGW50MuW>zEPeXMnlZWNJls4em1Z6nX+eZ_)jSu zQWx;@*VuJL8fK0$#GDeni;EwE+ykPa=D4Gq<8P8Lb#<4f_$@`wN3Rxry1%>aBR|X> zQ=mB^L9VVqN|M1?!GNpJS7!RVKJ#eBrtr57ks(I{`X#!8Tth*D-~jQ05rd(DftiU3 zg8_^o!SlnYL22K)m#Y?qSM|5N(w=Xjj!mrir 1601981300 +1100 commit (initial): myfile1 +c353473bb2ef43d48a78ed053bc2e1f280e37215 56a707665291bb59eff01a7c25f14c3e9ad9a28d CI 1601981300 +1100 commit: myfile2 +56a707665291bb59eff01a7c25f14c3e9ad9a28d e0f0a11e4de3f37f143b508c0084a4d58a672afc CI 1601981300 +1100 commit: myfile3 +e0f0a11e4de3f37f143b508c0084a4d58a672afc f612cb91eecb4ccf9e47dfda31ca63ab700d5383 CI 1601981300 +1100 commit: myfile4 +f612cb91eecb4ccf9e47dfda31ca63ab700d5383 c353473bb2ef43d48a78ed053bc2e1f280e37215 CI 1601981304 +1100 rebase -i (start): checkout c353473bb2ef43d48a78ed053bc2e1f280e37215 +c353473bb2ef43d48a78ed053bc2e1f280e37215 b5551403e8d2c3d141e8b4523e4b9892337fec8a CI 1601981304 +1100 rebase -i (pick): myfile3 +b5551403e8d2c3d141e8b4523e4b9892337fec8a cee4caccdc4fcfb3e69d54981c466bcb5ee50037 CI 1601981304 +1100 rebase -i (pick): myfile4 +cee4caccdc4fcfb3e69d54981c466bcb5ee50037 cee4caccdc4fcfb3e69d54981c466bcb5ee50037 CI 1601981304 +1100 rebase -i (finish): returning to refs/heads/master +cee4caccdc4fcfb3e69d54981c466bcb5ee50037 b5551403e8d2c3d141e8b4523e4b9892337fec8a CI 1601981305 +1100 reset: moving to b5551403e8d2c3d141e8b4523e4b9892337fec8a +b5551403e8d2c3d141e8b4523e4b9892337fec8a fc34f28ab77f236452f97c9cf8fdfe687d23938e CI 1601981309 +1100 commit: test diff --git a/test/integration/searching/expected/.git_keep/logs/refs/heads/master b/test/integration/searching/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..f7c404f2f --- /dev/null +++ b/test/integration/searching/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 c353473bb2ef43d48a78ed053bc2e1f280e37215 CI 1601981300 +1100 commit (initial): myfile1 +c353473bb2ef43d48a78ed053bc2e1f280e37215 56a707665291bb59eff01a7c25f14c3e9ad9a28d CI 1601981300 +1100 commit: myfile2 +56a707665291bb59eff01a7c25f14c3e9ad9a28d e0f0a11e4de3f37f143b508c0084a4d58a672afc CI 1601981300 +1100 commit: myfile3 +e0f0a11e4de3f37f143b508c0084a4d58a672afc f612cb91eecb4ccf9e47dfda31ca63ab700d5383 CI 1601981300 +1100 commit: myfile4 +f612cb91eecb4ccf9e47dfda31ca63ab700d5383 cee4caccdc4fcfb3e69d54981c466bcb5ee50037 CI 1601981304 +1100 rebase -i (finish): refs/heads/master onto c353473bb2ef43d48a78ed053bc2e1f280e37215 +cee4caccdc4fcfb3e69d54981c466bcb5ee50037 b5551403e8d2c3d141e8b4523e4b9892337fec8a CI 1601981305 +1100 reset: moving to b5551403e8d2c3d141e8b4523e4b9892337fec8a +b5551403e8d2c3d141e8b4523e4b9892337fec8a fc34f28ab77f236452f97c9cf8fdfe687d23938e CI 1601981309 +1100 commit: test diff --git a/test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/searching/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/29/cfbab279d8677b1614786c8161d915c3851334 b/test/integration/searching/expected/.git_keep/objects/29/cfbab279d8677b1614786c8161d915c3851334 new file mode 100644 index 0000000000000000000000000000000000000000..b1e421f48381999931e66f904467ce8a737a4e8f GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tDWIwB1KWCb13x0@hP literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/searching/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/searching/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/35/98e6458e34f1a1c51ffbbc3f9073b8dd4694eb b/test/integration/searching/expected/.git_keep/objects/35/98e6458e34f1a1c51ffbbc3f9073b8dd4694eb new file mode 100644 index 0000000000000000000000000000000000000000..f76a4a716c1b30361cac750452db29983669b4ce GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV$5(qn^*fx*|RtNrxXsU3wZf!>^dTiqQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApn3rE`I=%FoXaA literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/searching/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f new file mode 100644 index 0000000000000000000000000000000000000000..953241815cfa19b4d357807bedcbb2277b2e3ba8 GIT binary patch literal 21 ccmb{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/56/a707665291bb59eff01a7c25f14c3e9ad9a28d b/test/integration/searching/expected/.git_keep/objects/56/a707665291bb59eff01a7c25f14c3e9ad9a28d new file mode 100644 index 0000000000000000000000000000000000000000..eacaba80a0aa5f9dd7783ac74f8b0345f62458b4 GIT binary patch literal 148 zcmV;F0Biqv0gcW}3c@fHKvBn8MdpIMPre``bkt?!^MVCqONpSnw@Yw(IfGl)-j|^< zn$y@tbn@tiYBGh9tbK1c=2xsYI^ z0K%Tos`MU@b=T9ZuhV>&PwLxKE@kaEjSesdWB`3e1W-pkriT27Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV$5(qn^*fx*|RtNrxXsU3wZf!>^dTiqQsQJ-y~n^>Ml+3TZ){IUM>1`e|OtQ JegIq=ENSLKF0uds literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/searching/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/searching/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/b5/551403e8d2c3d141e8b4523e4b9892337fec8a b/test/integration/searching/expected/.git_keep/objects/b5/551403e8d2c3d141e8b4523e4b9892337fec8a new file mode 100644 index 0000000000000000000000000000000000000000..a0bd3ebd63153bd5cf56f9216f9267c53c4308de GIT binary patch literal 152 zcmV;J0B8Sr0fmmc3IZ_@0Il;C=>^GV^VoohaMgWA9veKkct?n!fA1CccEd2m.HH="QI?yoY7-, \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 b/test/integration/searching/expected/.git_keep/objects/ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 new file mode 100644 index 000000000..df4785246 --- /dev/null +++ b/test/integration/searching/expected/.git_keep/objects/ce/e4caccdc4fcfb3e69d54981c466bcb5ee50037 @@ -0,0 +1,2 @@ +xM +0@a9Ed:vDzLR"½ǷxiunNmW腵'ϊT @PJ #LF]F=C%@wC&&c88%fw =8gzL5MyQ2_m: \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/searching/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/searching/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/e0/f0a11e4de3f37f143b508c0084a4d58a672afc b/test/integration/searching/expected/.git_keep/objects/e0/f0a11e4de3f37f143b508c0084a4d58a672afc new file mode 100644 index 0000000000000000000000000000000000000000..e7b54c63c0abf5cd1f4db025b1b486748420eec7 GIT binary patch literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}%b=T9ZuhV?z5B2TIm%8?whF~BkKx6b7z!-JdV`}i9x$0k8o{Z`T8nQaK D&#o)J(@#KeO0TFK@gP}rA(puG&_h1AhPh% zLLWNG$;i7t_tTD(9meUQA1TMCx3rhLMGx3VBmjFw1Tc-Zsj7eKrhN0dDVrbOPB_Yc C=|$}T literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/fc/34f28ab77f236452f97c9cf8fdfe687d23938e b/test/integration/searching/expected/.git_keep/objects/fc/34f28ab77f236452f97c9cf8fdfe687d23938e new file mode 100644 index 0000000000000000000000000000000000000000..9fa03c39605d3e42792be40f55c5348d9c5a6e6d GIT binary patch literal 146 zcmV;D0B!$x0gcW}3c@fHMq$TUMdpI!Cb{MYM1+pIj6D9LU~GvIT)tg`)5AA7Wo_*- zG(|d$4rqa|RAK-GE^xLamIJC7j_iwPBMXTnwWW^N(3zRZ8waVjxJsTN*|T-we5*hS=&|9*-#X6Ch8-RF>0^-)WDxy4ZMf?0jK-o zlC=DZ$rmNF9VPVdGqC4Yre)@&8UhuB1i88bDM 1601981310 +1100 commit (initial): myfile1 +f2214a28aa9be25c7bf34dc84aa98059728db102 0264611003567cbe3b08955a8e745786c688ec7a CI 1601981321 +1100 commit: one +0264611003567cbe3b08955a8e745786c688ec7a 5f82960be010ac424ab7485684942813aff754e8 CI 1601981324 +1100 commit: test diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..adae1350f --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 f2214a28aa9be25c7bf34dc84aa98059728db102 CI 1601981310 +1100 commit (initial): myfile1 +f2214a28aa9be25c7bf34dc84aa98059728db102 0264611003567cbe3b08955a8e745786c688ec7a CI 1601981321 +1100 commit: one +0264611003567cbe3b08955a8e745786c688ec7a 5f82960be010ac424ab7485684942813aff754e8 CI 1601981324 +1100 commit: test diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/02/64611003567cbe3b08955a8e745786c688ec7a b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/02/64611003567cbe3b08955a8e745786c688ec7a new file mode 100644 index 000000000..e5102bd0d --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/02/64611003567cbe3b08955a8e745786c688ec7a @@ -0,0 +1,2 @@ +xA + @Ѯ=BQU1NFZ1 =~sn?o\jC.$B|(AW>bD.G>@[SdNY˘V9>׌@?;/v~oIw0E'7mS){9 \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 new file mode 100644 index 0000000000000000000000000000000000000000..c64d709a0d497cda6a9792d9c414fd6b2cb332c3 GIT binary patch literal 52 zcmV-40L%Y)0V^p=O;s>9WiT`_Ff%bx$gNDv%t9WiT`_Ff%bx$gNDv%t8k`INRk`lOd(7RxdKb6_n{gld|xKVkj`2xxqIB!p! BNR$8o literal 0 HcmV?d00001 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/6b/f2cc26256f2eae6ed4058ce1bc924b84a560f0 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/6b/f2cc26256f2eae6ed4058ce1bc924b84a560f0 new file mode 100644 index 0000000000000000000000000000000000000000..d961cc170d21c4e0dc4420db3d7469fea6e3a102 GIT binary patch literal 52 zcmV-40L%Y)0V^p=O;s>9WiT`_Ff%bx$gNDv%t7% KxDfzCR}q*Xh8DyC literal 0 HcmV?d00001 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/7b/ba8c8e64b598d317cdf1bb8a63278f9fc241b1 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/7b/ba8c8e64b598d317cdf1bb8a63278f9fc241b1 new file mode 100644 index 0000000000000000000000000000000000000000..b94e362066bb4fc127449b83df7c66cbf4eb796d GIT binary patch literal 26 hcmbp$1Qw7!>oFe*pk(BndD8 literal 0 HcmV?d00001 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf new file mode 100644 index 0000000000000000000000000000000000000000..80eb62ee36358636d7a654d8a0fe6b7ed0c7ce4e GIT binary patch literal 29 lcmb>xպtN}W%2ۜ]D-"-!pRˮ<$g_mi4?#u[ZtQI?߲ +=, \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..c9d519ec1 --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +5f82960be010ac424ab7485684942813aff754e8 diff --git a/test/integration/searchingInStagingPanel/expected/myfile1 b/test/integration/searchingInStagingPanel/expected/myfile1 new file mode 100644 index 000000000..a92d664bc --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/myfile1 @@ -0,0 +1,3 @@ +line 1 +line 2 +line 3 diff --git a/test/integration/searchingInStagingPanel/snapshot.txt b/test/integration/searchingInStagingPanel/snapshot.txt deleted file mode 100644 index 281d5ffca..000000000 --- a/test/integration/searchingInStagingPanel/snapshot.txt +++ /dev/null @@ -1,36 +0,0 @@ -On branch master -nothing to commit, working tree clean -line 1 -line 2 -line 3 -test - - -diff --git a/myfile1 b/myfile1 -index 7bba8c8..a92d664 100644 ---- a/myfile1 -+++ b/myfile1 -@@ -1,2 +1,3 @@ - line 1 - line 2 -+line 3 -one - - -diff --git a/myfile1 b/myfile1 -index 89b24ec..7bba8c8 100644 ---- a/myfile1 -+++ b/myfile1 -@@ -1 +1,2 @@ - line 1 -+line 2 -myfile1 - - -diff --git a/myfile1 b/myfile1 -new file mode 100644 -index 0000000..89b24ec ---- /dev/null -+++ b/myfile1 -@@ -0,0 +1 @@ -+line 1 diff --git a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..01a9c0330 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,30 @@ +# This is a combination of 3 commits. +# This is the 1st commit message: + +myfile2 + +# This is the commit message #2: + +myfile3 + +# The commit message #3 will be skipped: + +# myfile5 + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Date: Tue Oct 6 21:47:36 2020 +1100 +# +# interactive rebase in progress; onto 0c6aed6 +# Last commands done (4 commands done): +# drop 35bf029 myfile4 +# fixup 51a88ed myfile5 +# No commands remaining. +# You are currently rebasing branch 'master' on '0c6aed6'. +# +# Changes to be committed: +# new file: myfile2 +# new file: myfile3 +# new file: myfile5 +# diff --git a/test/integration/squash/expected/.git_keep/FETCH_HEAD b/test/integration/squash/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/squash/expected/.git_keep/HEAD b/test/integration/squash/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/squash/expected/.git_keep/ORIG_HEAD b/test/integration/squash/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..93c77382b --- /dev/null +++ b/test/integration/squash/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ac0b81af0c436000141d41d6bfbf61fe41567eca diff --git a/test/integration/squash/expected/.git_keep/config b/test/integration/squash/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/squash/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/squash/expected/.git_keep/description b/test/integration/squash/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/squash/expected/.git_keep/index b/test/integration/squash/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..c94c1469cb4eb84ee4d6c35fa836c2444d405bd6 GIT binary patch literal 425 zcmZ?q402{*U|<4bmiQWP5AI!kl`xtSD8`zZWWvDExP*a$@heb`2oSR^-ShabYU+(I z5us5$`A!!Cyjr@iGO*`Xre)@&8Uhsn^?R9ZI_LwVq2{bZH%Ef!hf#ylzH={EEefyd zZ+WFX-$ET`juFHhKe1njjswjB(@=BvqnmR-n^*fx*|RtNrxXsU3wZf!>^dS1GshTe zj>K-^g&=c4G}N4P=;rvF-@Qi7i|B0w8&XnE)wJ#3JOdINKlwC7#bLunV2vbz!;ZIjy?$gXLPLW nRr-t57GIKLZ@mt|Cbl5GTjb}vppw(`eRrt8`k$?J-*!0w02-Ab literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/info/exclude b/test/integration/squash/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/squash/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/squash/expected/.git_keep/logs/HEAD b/test/integration/squash/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..7d1bab2af --- /dev/null +++ b/test/integration/squash/expected/.git_keep/logs/HEAD @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981256 +1100 commit (initial): myfile1 +0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981256 +1100 commit: myfile2 +ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI 1601981256 +1100 commit: myfile3 +db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI 1601981256 +1100 commit: myfile4 +35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI 1601981256 +1100 commit: myfile5 +51a88edd955132342caad6512e92d25164b5f7d3 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981258 +1100 rebase -i (start): checkout 0c6aed66ccd076086011a0e68bf67e3477cd5e1d +0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981258 +1100 rebase -i: fast-forward +ac0b81af0c436000141d41d6bfbf61fe41567eca 75afa841946755c424097363ba4e5682951b02e3 CI 1601981262 +1100 rebase -i (squash): # This is a combination of 2 commits. +75afa841946755c424097363ba4e5682951b02e3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (fixup): myfile2 +5ef618ee84d1fbb6f277996061996ce5ec0faf4e 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/squash/expected/.git_keep/logs/refs/heads/master b/test/integration/squash/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..adbf39bb5 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI 1601981256 +1100 commit (initial): myfile1 +0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI 1601981256 +1100 commit: myfile2 +ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI 1601981256 +1100 commit: myfile3 +db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI 1601981256 +1100 commit: myfile4 +35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI 1601981256 +1100 commit: myfile5 +51a88edd955132342caad6512e92d25164b5f7d3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI 1601981262 +1100 rebase -i (finish): refs/heads/master onto 0c6aed66ccd076086011a0e68bf67e3477cd5e1d diff --git a/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d b/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d new file mode 100644 index 0000000000000000000000000000000000000000..16d75b6d3a92dfbf8807ebaaf88ffa91b049566b GIT binary patch literal 119 zcmV--0Eqv10ga783WG2Z0DI0W_FgEvc3mTsB6#u{G1*YTB}Gzbe{Y`9>oCK_VzyNv zmP~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 b/test/integration/squash/expected/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 new file mode 100644 index 0000000000000000000000000000000000000000..45934b1249a9d54118deb2f96fe3da45e68f6f67 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8bygIgTG0>)YV;@;HhAvkNf~bB{~=03_oT7 literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/squash/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/squash/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/squash/expected/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be new file mode 100644 index 0000000000000000000000000000000000000000..aca754d63288ea16d4cd69754eac3b0cba133abe GIT binary patch literal 154 zcmV;L0A>Gp0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR~Cjm@@dAW zjnSRPE}~6k^bQDY0B1u*mywx5vc%%qI7=l_M75<|UPC{!@x?*}TYODS>?D?G2%=A5 za|ptjy?B-07-83>_3}}e;84*Ao^_Uv+Cs*xTmsOnl0k45L Eb5W>B-v9sr literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/squash/expected/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f new file mode 100644 index 0000000000000000000000000000000000000000..953241815cfa19b4d357807bedcbb2277b2e3ba8 GIT binary patch literal 21 ccmb{;fo08o?%QUCw| literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 b/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 new file mode 100644 index 000000000..faddde627 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 @@ -0,0 +1,2 @@ +xK +0@] 2ɯ "tcL [Jnkks8SE4cfkLƺsMRŰ%J65T 15a!'%GPu㤯t7mK^M"@ڧ΋8:' \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e b/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e new file mode 100644 index 000000000..871b5bdc9 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e @@ -0,0 +1,3 @@ +x}A +0E] 2Ӵ)] ƖAoo]{|އ'K)s S13uSipavA_U;d4IvpplnJkkm=-(T074aYx zG*rJTic8L^fkl1SHW4s0PL>^Eh=aA!4>m?0&_<`(%@z%h{j#Ww-(+o|nY;ud=Ab9i zjx?gzLT-*Ui5;ei!zdV(zqX}pa6G}&@pO$=Xy1?tf8j5y0ARFUV4>f0ak2@_S5YG3pQdRq@Ti N&itTOeE^I%U~5NgX_Wu~ literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/squash/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/squash/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca b/test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca new file mode 100644 index 0000000000000000000000000000000000000000..0e42ce6545fc3d60c647e103cbe120bfaafb50a9 GIT binary patch literal 149 zcmV;G0BZku0gaA93d0~21-teX?hECAW1b436tc=OjDBe#HX&GOZ{HlD+hGPKZM7~< zbFi0oi0J4#%droIauz88K@iG}4&DISn3;;P47JBYUQJU%lnkVl$$>nGIg-H71x`Ba zT*|$0R`K1Q+o8uv599QZPptbYx3tx}<}(VOO%Hu#CQ>Ior<(k!tNJa=Dn|VP-uOCA DgUCjn literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/squash/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 b/test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 new file mode 100644 index 0000000000000000000000000000000000000000..7ce662ad9dc7990dd4e0f276f5fa979d4290ff62 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fDMP26<*$Xn$Nz(`-LRUS;WIBU|#+DL6Z*Ptue0cD9i!WO# zOZ9jSr+TRRF5^IwBF+|wj02hRjARKUWx`JSMp3u(p|9#$ASYx42^0YU1I}$RTegU% z0sAiu>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/refs/heads/master b/test/integration/squash/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..db941a31f --- /dev/null +++ b/test/integration/squash/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +5ef618ee84d1fbb6f277996061996ce5ec0faf4e diff --git a/test/integration/squash/expected/myfile1 b/test/integration/squash/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/squash/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/squash/expected/myfile2 b/test/integration/squash/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/squash/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/squash/expected/myfile3 b/test/integration/squash/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/squash/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/squash/expected/myfile5 b/test/integration/squash/expected/myfile5 new file mode 100644 index 000000000..4f346f1ad --- /dev/null +++ b/test/integration/squash/expected/myfile5 @@ -0,0 +1 @@ +test5 diff --git a/test/integration/squash/snapshot.txt b/test/integration/squash/snapshot.txt deleted file mode 100644 index 445bf0f96..000000000 --- a/test/integration/squash/snapshot.txt +++ /dev/null @@ -1,42 +0,0 @@ -On branch master -nothing to commit, working tree clean -test1 -test2 -test3 -test5 -myfile2 - -myfile3 - - -diff --git a/myfile2 b/myfile2 -new file mode 100644 -index 0000000..180cf83 ---- /dev/null -+++ b/myfile2 -@@ -0,0 +1 @@ -+test2 -diff --git a/myfile3 b/myfile3 -new file mode 100644 -index 0000000..df6b0d2 ---- /dev/null -+++ b/myfile3 -@@ -0,0 +1 @@ -+test3 -diff --git a/myfile5 b/myfile5 -new file mode 100644 -index 0000000..4f346f1 ---- /dev/null -+++ b/myfile5 -@@ -0,0 +1 @@ -+test5 -myfile1 - - -diff --git a/myfile1 b/myfile1 -new file mode 100644 -index 0000000..a5bce3f ---- /dev/null -+++ b/myfile1 -@@ -0,0 +1 @@ -+test1