From ace4350319f48cf533e0a780a020165b9746fd26 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Apr 2021 11:17:32 +1000 Subject: [PATCH] update snapshots to include tags comparison --- pkg/integration/integration.go | 28 ++++---- .../expected/.git_keep/index | Bin 145 -> 145 bytes .../expected/.git_keep/logs/HEAD | 12 ++-- .../expected/.git_keep/logs/refs/heads/four | 2 +- .../expected/.git_keep/logs/refs/heads/master | 2 +- .../expected/.git_keep/logs/refs/heads/one | 2 +- .../expected/.git_keep/logs/refs/heads/three | 2 +- .../expected/.git_keep/logs/refs/heads/two | 2 +- .../78/77532bb822c0e04f5ecbc78fc414f997ba53cf | Bin 123 -> 0 bytes .../f7/53f4dfc98d148a7e685c46c8d148bcac56707d | Bin 0 -> 122 bytes .../expected/.git_keep/refs/heads/four | 2 +- .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/refs/heads/one | 2 +- .../expected/.git_keep/refs/heads/three | 2 +- .../expected/.git_keep/refs/heads/two | 2 +- .../commit/expected/.git_keep/index | Bin 425 -> 425 bytes .../commit/expected/.git_keep/logs/HEAD | 10 +-- .../expected/.git_keep/logs/refs/heads/master | 10 +-- .../14/40bc6cc888a09dca2329d1060eec6de78d9d21 | Bin 0 -> 148 bytes .../3d/f3d8761bc0f0828596b11845aeac175b7b7393 | 3 + .../4b/a4f1ed711a9081fab21bc222469aa5176a01f8 | Bin 0 -> 149 bytes .../6b/d1486e023f9853f9e6f611cac5ccbc8960ce57 | Bin 149 -> 0 bytes .../98/0224a1dd75d91fdcab11edc8d25c3ff8f751ba | Bin 149 -> 0 bytes .../a7/d53cc21fd53100f955377be379423b0e386274 | Bin 0 -> 150 bytes .../d0/cab53ed70fc66096575c2ccd7ef150b4b470e8 | Bin 146 -> 0 bytes .../e7/560e2cd4783a261ad32496cefed2d9f69a46e7 | Bin 0 -> 145 bytes .../f4/e779d1bd2ad074259ad763210f5b911337054f | 2 - .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/ORIG_HEAD | 2 +- .../expected/.git_keep/index | Bin 1524 -> 1524 bytes .../expected/.git_keep/logs/HEAD | 16 ++--- .../.git_keep/logs/refs/heads/conflict | 6 +- .../.git_keep/logs/refs/heads/conflict_second | 8 +-- .../07/76b49486a00aecd966e4d72e14edea5fad91a8 | Bin 182 -> 0 bytes .../11/bdfc142c42c6ffaa904890ab61ec76262ec9ca | 2 + .../32/47afc767cff1c98fe5277005f6653547b20fa4 | 2 - .../36/33f8c997d88e0c59202f498c8344da9da3aaf4 | 2 - .../39/d62c8a07e5103fef16c32373738ce92c4549b7 | Bin 203 -> 0 bytes .../45/9fa5065afddb89a3dccddef39b17b5fd74d041 | 3 - .../83/7fbbc4ee6892b828a4a94be22c39814146aafb | Bin 147 -> 0 bytes .../85/4f08fa802293e0679d07771547fe9fe5d159e8 | Bin 0 -> 201 bytes .../8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e | Bin 0 -> 147 bytes .../98/e834e9cdae1191de7fafb2b6f334bddd0793e8 | Bin 0 -> 116 bytes .../99/76d7948def8b082e9d20135d6a04624d711752 | 1 + .../c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 | 2 + .../expected/.git_keep/refs/heads/conflict | 2 +- .../.git_keep/refs/heads/conflict_second | 2 +- .../filterPath/expected/.git_keep/index | Bin 281 -> 281 bytes .../filterPath/expected/.git_keep/logs/HEAD | 14 ++-- .../expected/.git_keep/logs/refs/heads/master | 14 ++-- .../03/15577613e2e65683d0dcf3371940a44ea073ca | Bin 148 -> 0 bytes .../22/adc4567aba3d1a0acf28b4cef312922d516aeb | Bin 0 -> 146 bytes .../4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 | Bin 0 -> 148 bytes .../4c/2d0500178f2642effb990e6d65e073022bf50b | Bin 118 -> 0 bytes .../51/92ae05adf946800910d092fb406eb04d56a578 | Bin 146 -> 0 bytes .../5f/bbe6422fb135ada1a05b15f61369747d4e6842 | 5 -- .../66/7b767bf067438c08d47c54fe756a34f238b90d | Bin 145 -> 0 bytes .../8b/476a1094290d7251c56305e199eb2a203d8682 | Bin 0 -> 146 bytes .../af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 | Bin 0 -> 145 bytes .../d6/9102e71a2f400fe52feab06516e05cdaf7d0ba | Bin 147 -> 0 bytes .../d7/236d5f85ad303f5f23141661e4c8959610b70b | 2 + .../f2/4812da035a21812bc4c73018349ac2f0a6ec39 | 2 + .../f3/d94fa1d4be39b8daae35b82525bf357aa712de | Bin 0 -> 118 bytes .../f7/12b0a288ced6c49e6cfcf16f7af0991e50849d | 3 - .../expected/.git_keep/refs/heads/master | 2 +- .../filterPath2/expected/.git_keep/index | Bin 353 -> 353 bytes .../filterPath2/expected/.git_keep/logs/HEAD | 12 ++-- .../expected/.git_keep/logs/refs/heads/master | 12 ++-- .../23/b4388df8cdc033c4266f55a4234c41f2e6a857 | Bin 148 -> 0 bytes .../36/d991b179958e18281131be9914649ebe40bfba | Bin 119 -> 0 bytes .../6c/dce80c062ba2c8f8758879834a936b84ead78c | Bin 0 -> 147 bytes .../70/3f7069185227287623aaba7cdb0e56ae7a6c60 | Bin 0 -> 118 bytes .../7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa | 2 - .../91/4d8fff27717808920192dc44535c711f41dc75 | Bin 152 -> 0 bytes .../92/ec47058a2894afbbbd69c5f79bff20c503e686 | Bin 0 -> 147 bytes .../a5/c053a7a46bce2775edb371a9aa97424b542ab7 | Bin 0 -> 148 bytes .../c1/a2676f74b3007ebb101d4d121cecb4850f1378 | Bin 148 -> 0 bytes .../c5/f9a8793f15aa0db816944424adb4303eb036a8 | 2 + .../e7/c2bd00356720683d5bc4362ef5b92655fa8914 | 3 + .../f6/707836a7d9a861ebfeff921a45ed43cd429cef | 2 - .../expected/.git_keep/refs/heads/master | 2 +- .../filterPath3/expected/.git_keep/index | Bin 353 -> 353 bytes .../filterPath3/expected/.git_keep/logs/HEAD | 12 ++-- .../expected/.git_keep/logs/refs/heads/master | 12 ++-- .../23/1410172e8f51138f06d8dff963898fb1e97b30 | Bin 0 -> 147 bytes .../2c/7b461ce430e2d743ee239f0c994fd60f90c863 | Bin 154 -> 0 bytes .../72/226d27a85fff688d32c134a22ebe650d6c2e41 | Bin 0 -> 148 bytes .../76/ff9510a110483d5de27a6d2c1b1a0e82207431 | 2 - .../87/1d1c0423b07670f34db0ca48738dcec548512e | Bin 148 -> 0 bytes .../8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 | 2 + .../a6/68d8690712ac945055bd187ed70fd10541dd38 | Bin 146 -> 0 bytes .../ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 | Bin 147 -> 0 bytes .../b3/5d7fa77c939890020952987eeb461f410297d8 | 3 + .../c1/a1ba9d2873d7163606bb5fdf46e50975db042b | 3 + .../db/6681a3e9fb9fb6ef524771cdc763904dd2b54d | 3 + .../e9/2eec6edb251fbc68435ffd5cd7a52f886f062d | Bin 118 -> 0 bytes .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/MERGE_HEAD | 2 +- .../expected/.git_keep/ORIG_HEAD | 2 +- .../expected/.git_keep/index | Bin 2118 -> 2118 bytes .../expected/.git_keep/logs/HEAD | 66 ++++++++--------- .../.git_keep/logs/refs/heads/base_branch | 6 +- .../.git_keep/logs/refs/heads/develop | 10 +-- .../logs/refs/heads/feature/cherry-picking | 18 ++--- .../expected/.git_keep/logs/refs/heads/master | 10 +-- .../.git_keep/logs/refs/heads/other_branch | 4 +- .../01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b | Bin 153 -> 0 bytes .../05/a37c1f6dc7942f15f80d45254d38735918f670 | 2 - .../06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 | 2 - .../08/e2576bb7cd0dd9be54f9a523c4bedea0643557 | Bin 0 -> 146 bytes .../17/dc45dd142947e06cf7e635d62f2c0acbb86da7 | Bin 0 -> 153 bytes .../18/c07ac9568c564ececb199f78f64babc92214cb | Bin 0 -> 159 bytes .../27/9f068805e089660f7ddd17ff32f66100e0dca5 | 3 + .../2f/15f547118f3c3d9c81175825923e13ec6f0aa0 | 2 - .../31/f2a971f823279ba1ef877be7599da288f6e24b | Bin 0 -> 121 bytes .../39/b895b8f8b050030fe6aaf6404c660f22b939e7 | Bin 165 -> 0 bytes .../3d/1213374cd86b841f034768571d0b5f2c870a16 | Bin 0 -> 161 bytes .../44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 | 2 + .../4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 | 2 + .../54/b6871251edf1636a77993925843c6294daa768 | Bin 158 -> 0 bytes .../5d/c2e019349371e9b3e4f1be99754ba70094cad6 | 2 + .../61/f5538c896ea41a0303368b24ab8e5dd6b0fba3 | Bin 155 -> 0 bytes .../68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 | Bin 0 -> 155 bytes .../6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 | 3 + .../7b/c178be031c4645110e9accb4accf16902d2d7f | Bin 0 -> 158 bytes .../82/db6d0e4502f489719ea0f3dbe7e14413c6d28a | 3 + .../8c/d762c119834784fdbf97e9bb3b4c15e804ebaa | Bin 0 -> 147 bytes .../8c/eeb6cc4581b42aa9deaf9710223615ee17bef2 | 3 - .../8f/9f24614460289546a49cb6f12a72b764af14f5 | 2 - .../97/769241761ba59cd64059d15b548e65e8d3e65f | Bin 156 -> 0 bytes .../9c/09cc9177a699a0a920d8c2a84cd2de68295382 | 3 - .../9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 | Bin 147 -> 0 bytes .../ab/79b4d60771766afa792d180d79f39d60739285 | 5 -- .../ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 | 3 - .../b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 | Bin 158 -> 0 bytes .../bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 | Bin 121 -> 0 bytes .../bc/074264114488d21413b64eb72fdfaac5a79427 | 3 - .../c2/7ef6b4964209a875191eca7e56605c8efa5eee | Bin 0 -> 154 bytes .../c5/0f7e1375a30118c2886d4b31318579f3419231 | Bin 0 -> 154 bytes .../c6/22516f02266679505b89103007ec04b8748b67 | Bin 147 -> 0 bytes .../c9/b473bec307b18fd94a913658f4d759be63ca47 | Bin 0 -> 156 bytes .../ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 | 2 + .../d2/5721fffa7dc911ff2a9102bef201db225e2f16 | Bin 0 -> 166 bytes .../db/f5ab9a4fa3f976d266f3be50670aa83121b420 | 3 + .../e3/a8db29b20f1aa519419cf02d0ce0a313a26270 | 2 - .../ea/69b78c08d9698cadc90164ddd19aca6ae05d5f | 2 - .../expected/.git_keep/refs/heads/base_branch | 2 +- .../expected/.git_keep/refs/heads/develop | 2 +- .../refs/heads/feature/cherry-picking | 2 +- .../expected/.git_keep/refs/heads/master | 2 +- .../.git_keep/refs/heads/other_branch | 2 +- .../expected/.git_keep/ORIG_HEAD | 2 +- .../mergeConflicts/expected/.git_keep/index | Bin 1814 -> 1814 bytes .../expected/.git_keep/logs/HEAD | 68 +++++++++--------- .../.git_keep/logs/refs/heads/base_branch | 6 +- .../.git_keep/logs/refs/heads/develop | 10 +-- .../logs/refs/heads/feature/cherry-picking | 18 ++--- .../expected/.git_keep/logs/refs/heads/master | 10 +-- .../.git_keep/logs/refs/heads/other_branch | 6 +- .../00/dc25bdd47993a880597e0680039d04a4d3328d | 3 - .../05/39c9baf43fb1939d8f56695ceb08a86e8e1fae | 3 - .../0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 | Bin 0 -> 148 bytes .../16/18ce1085acb41fd710e279ac38911aadfb0a09 | Bin 0 -> 121 bytes .../17/4226770a9dfeb661c9818c920568703c27c480 | 3 - .../1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 | 3 - .../1d/d0692a163379d160e23ac52509d909b41b0a35 | Bin 147 -> 0 bytes .../1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 | 4 ++ .../32/129537d40d9fb35cf3dd6fba7985870142324b | Bin 202 -> 0 bytes .../34/1cf8213827614a274c750cd7dec4307eb41de7 | Bin 0 -> 153 bytes .../41/7a3f75c440e565dab9b5afa78747ef37446348 | Bin 158 -> 0 bytes .../4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 | Bin 158 -> 0 bytes .../54/757435deaedf649b36b12188bc8a5e3ea6a833 | 3 - .../55/9043765dc6c32c943b6278b4abbff1e6f52839 | 3 + .../55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 | 6 ++ .../56/2af0640203fb5a6e92c090d8d1ded26806d2c4 | Bin 0 -> 147 bytes .../5e/3a33cb09434849f7bbabaaad8386c9f0508eec | Bin 163 -> 0 bytes .../61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf | 2 + .../8e/13f545446048648331cbe93de64b1cf22df166 | 2 - .../91/e16cacdb23b0b5515c6109ea301b0cb6367010 | 2 - .../a1/9ec0b99e516795f349033f09383f87be0b74e9 | 2 + .../a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b | 4 ++ .../a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b | 4 -- .../a4/2af37388a9ad2eac85f71828cfc63262c90900 | 3 - .../a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d | 2 - .../b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 | Bin 0 -> 153 bytes .../b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a | 3 + .../c5/507059e2aa65bc2dad65bd38b879079b69c48c | Bin 121 -> 0 bytes .../cc/19bee93215b6c20ab129fb2c006762d4ae1497 | Bin 0 -> 155 bytes .../d3/e2708327280097b5e1f8ab69309934b24f8b64 | 3 + .../dd/259e90c3748e269bdf1ee3ce537a006d2394aa | 3 + .../df/2c0daa40dcba0dded361a25ff7806b13db59a6 | Bin 0 -> 154 bytes .../e5/63585cb87cc39b553ca421902d631ea8890118 | 2 + .../ed/d4e2e50eb82125428b045c540a9194d934e180 | Bin 0 -> 154 bytes .../ee/b8990921f62a1ec3fc0be960c8068a24503ca8 | Bin 154 -> 0 bytes .../f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 | 2 - .../f2/a15f45b921460e675a8849db39de008b2c03cb | 3 - .../f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e | Bin 0 -> 163 bytes .../f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 | Bin 0 -> 158 bytes .../f8/dd12b796f400be7f59d9471670c3080f9c90a1 | 1 + .../fb/d2d93aec237d4e44e44f3647067972c3fa69f5 | 2 - .../fe/1f8f70f67822120b40d9d704011aec6e17c3a7 | Bin 158 -> 0 bytes .../expected/.git_keep/refs/heads/base_branch | 2 +- .../expected/.git_keep/refs/heads/develop | 2 +- .../refs/heads/feature/cherry-picking | 2 +- .../expected/.git_keep/refs/heads/master | 2 +- .../.git_keep/refs/heads/other_branch | 2 +- .../expected/.git_keep/ORIG_HEAD | 2 +- .../patchBuilding/expected/.git_keep/index | Bin 281 -> 281 bytes .../expected/.git_keep/logs/HEAD | 20 +++--- .../expected/.git_keep/logs/refs/heads/master | 12 ++-- .../01/ed22faef05591076721466e07fb10962642887 | Bin 0 -> 119 bytes .../24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa | Bin 0 -> 156 bytes .../24/79abfe7bd6b64a753d3c3797f614bbb422f627 | Bin 0 -> 148 bytes .../29/f276b162bc253add87f21f45013cbce86c4ab0 | Bin 154 -> 0 bytes .../5b/64b56ce78c5611173e73ee34cf0eb6fddac926 | Bin 150 -> 0 bytes .../5c/021eb54f0eac90e22f363ee9214454a55b81de | 2 - .../7a/40dadc0814bf7f1418d005eae184848a9f1c94 | Bin 0 -> 155 bytes .../92/2fc2ed1965fe8436ce7837c634379f14faf3c3 | Bin 0 -> 149 bytes .../92/571130f37c70766612048271f1d4dca63ef0b5 | Bin 0 -> 146 bytes .../a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 | 2 - .../aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c | Bin 149 -> 0 bytes .../c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 | Bin 0 -> 153 bytes .../cc/25737e7c56a583e7f22d97c66f304e90689206 | Bin 158 -> 0 bytes .../ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 | Bin 152 -> 0 bytes .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/ORIG_HEAD | 2 +- .../patchBuilding2/expected/.git_keep/index | Bin 281 -> 281 bytes .../expected/.git_keep/logs/HEAD | 12 ++-- .../expected/.git_keep/logs/refs/heads/master | 10 +-- .../expected/.git_keep/logs/refs/stash | 2 +- .../06/855901b0dbd8859a7ef5437380cef241f60187 | Bin 182 -> 0 bytes .../0a/1e762c8cd2587e05d56acb7294937adb3b90b4 | Bin 155 -> 0 bytes .../1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 | Bin 0 -> 164 bytes .../28/d8e975606801b4ba31b292312d4030109e4f1a | Bin 149 -> 0 bytes .../2c/60d208ba3ec966b77ca756237843af7584cf93 | 2 + .../50/63202049f1980e035c390732a7e6da8783357f | Bin 0 -> 150 bytes .../56/77dceabb2de40c648da3c831d037b429375131 | Bin 149 -> 0 bytes .../80/8f2484733488c2b6bd2f3773b04437bbb20434 | Bin 146 -> 0 bytes .../8a/fc5e59aed0d570b89e1a658641c02b604ce71d | Bin 164 -> 0 bytes .../9a/939087472cfaf305396d4b177ee888ced193d9 | 3 + .../a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 | 2 - .../ad/27dd25048bff07da92d2d9d829e4dd75472da4 | Bin 0 -> 149 bytes .../d0/ec73019f9c5e426c9b37fa58757855367580a5 | Bin 0 -> 155 bytes .../e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 | Bin 0 -> 146 bytes .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/refs/stash | 2 +- .../expected/.git_keep/index | Bin 407 -> 407 bytes .../expected/.git_keep/logs/HEAD | 6 +- .../expected/.git_keep/logs/refs/heads/master | 6 +- .../32/60dd534b59a53e44813fc97bb49742fb971cdf | Bin 121 -> 0 bytes .../4d/0cf75a1ca408441015baf53e8c745f4157771c | 2 - .../6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3 | Bin 145 -> 0 bytes .../88/981dbb0664057b766113679127284f69f4fb69 | Bin 0 -> 146 bytes .../b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 | 4 ++ .../c1/7dc7400fbb649385064c27544ba1e6c4751566 | Bin 0 -> 121 bytes .../expected/.git_keep/refs/heads/master | 2 +- .../searching/expected/.git_keep/index | Bin 353 -> 353 bytes .../searching/expected/.git_keep/logs/HEAD | 10 +-- .../expected/.git_keep/logs/refs/heads/master | 10 +-- .../3e/c60bb22aa39d08428e57e3251563f797b40fc8 | Bin 0 -> 146 bytes .../5f/b9c54526790a11246b733354bf896da8ffc09d | 2 + .../6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 | 2 + .../aa/6ceb765f57224d1196d23b6ba65a767765a1c5 | 2 - .../cb/b8acda2ebe17a088fc1f89251bd4d9b0397580 | Bin 149 -> 0 bytes .../e4/48ece7cf84d19a78095018a271731cdcc2bb1b | 3 - .../5f4d92d7babb2f40ebd2829dccee0afff44c70} | 2 +- .../f1/b38f1bd77ac351d397a83dd0ec1325e8622c01 | Bin 148 -> 0 bytes .../fb/01ecb35c6574bf41e689abec9afa337d22819e | Bin 146 -> 0 bytes .../fc/759ce6e48e0012eab3f02ec3524a55be938dd5 | Bin 0 -> 149 bytes .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/logs/HEAD | 4 +- .../expected/.git_keep/logs/refs/heads/master | 4 +- .../1f/b49389c3ca6720391e91714cff34f842b56328 | 2 - .../36/4e6307f708c6f17d83c7309aaf9a3034210236 | Bin 0 -> 145 bytes .../70/dcf03faa734af0278690e1b0f8e767b733d88a | 2 + .../d4/31809a4ded1399fbe0203a92eca627d40c873a | Bin 147 -> 0 bytes .../expected/.git_keep/refs/heads/master | 2 +- .../squash/expected/.git_keep/COMMIT_EDITMSG | 10 +-- .../squash/expected/.git_keep/ORIG_HEAD | 2 +- .../squash/expected/.git_keep/index | Bin 425 -> 425 bytes .../squash/expected/.git_keep/logs/HEAD | 20 +++--- .../expected/.git_keep/logs/refs/heads/master | 12 ++-- .../07/1c49e226b0040e0ecc3494417193357104914d | Bin 210 -> 0 bytes .../07/5bd21694c75fd12e11cbd487eb64d831362e8c | Bin 0 -> 157 bytes .../07/cf881fb6557a9676ff388420433cf375a3565e | Bin 148 -> 0 bytes .../11/0df011cb4464ac4073580e252abd1148e4d1b3 | Bin 147 -> 0 bytes .../20/e23116605fc77c1452a0834277e7f1f07c4c22 | Bin 148 -> 0 bytes .../3c/752371dc0c58af7ff63f7a6c252da9f4d96251 | Bin 0 -> 151 bytes .../47/e0e1f091e2be405f3e23e75eede4f6e392eda3 | Bin 154 -> 0 bytes .../88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 | Bin 0 -> 149 bytes .../9f/83377e9068d956fe3085934bb32ce22aeb4bf7 | 3 + .../a1/cf7798606057d592f8ef1bee884165b6f629f1 | 2 + .../a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 | 2 + .../b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa | Bin 150 -> 0 bytes .../c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 | 1 + .../e1/1ec0e7a753a2cc10e348948173064e17d127d6 | 2 - .../expected/.git_keep/refs/heads/master | 2 +- .../tags/expected/.git_keep/COMMIT_EDITMSG | 1 + .../tags/expected/.git_keep/FETCH_HEAD | 0 test/integration/tags/expected/.git_keep/HEAD | 1 + .../tags/expected/.git_keep/config | 10 +++ .../tags/expected/.git_keep/description | 1 + .../integration/tags/expected/.git_keep/index | Bin 0 -> 209 bytes .../tags/expected/.git_keep/info/exclude | 7 ++ .../tags/expected/.git_keep/logs/HEAD | 2 + .../expected/.git_keep/logs/refs/heads/master | 2 + .../1d/2a22db54ab37b582dc5e3c4ca660f06cdb4692 | Bin 0 -> 118 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../9d/577efe8be29a993269a0a737ca9c8321a2adc2 | Bin 0 -> 147 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../tags/expected/.git_keep/refs/heads/master | 1 + .../tags/expected/.git_keep/refs/tags/tag1 | 1 + .../tags/expected/.git_keep/refs/tags/tag3 | 1 + .../tags/expected/.git_keep/refs/tags/tag4 | 1 + test/integration/tags/expected/file0 | 1 + test/integration/tags/expected/file1 | 1 + test/integration/tags/recording.json | 1 + test/integration/tags/setup.sh | 16 +++++ test/integration/tags/test.json | 1 + 321 files changed, 465 insertions(+), 411 deletions(-) delete mode 100644 test/integration/branchAutocomplete/expected/.git_keep/objects/78/77532bb822c0e04f5ecbc78fc414f997ba53cf create mode 100644 test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d create mode 100644 test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 create mode 100644 test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 create mode 100644 test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 delete mode 100644 test/integration/commit/expected/.git_keep/objects/6b/d1486e023f9853f9e6f611cac5ccbc8960ce57 delete mode 100644 test/integration/commit/expected/.git_keep/objects/98/0224a1dd75d91fdcab11edc8d25c3ff8f751ba create mode 100644 test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 delete mode 100644 test/integration/commit/expected/.git_keep/objects/d0/cab53ed70fc66096575c2ccd7ef150b4b470e8 create mode 100644 test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 delete mode 100644 test/integration/commit/expected/.git_keep/objects/f4/e779d1bd2ad074259ad763210f5b911337054f delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/85/4f08fa802293e0679d07771547fe9fe5d159e8 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/98/e834e9cdae1191de7fafb2b6f334bddd0793e8 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 delete mode 100644 test/integration/filterPath/expected/.git_keep/objects/03/15577613e2e65683d0dcf3371940a44ea073ca create mode 100644 test/integration/filterPath/expected/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb create mode 100644 test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 delete mode 100644 test/integration/filterPath/expected/.git_keep/objects/4c/2d0500178f2642effb990e6d65e073022bf50b delete mode 100644 test/integration/filterPath/expected/.git_keep/objects/51/92ae05adf946800910d092fb406eb04d56a578 delete mode 100644 test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842 delete mode 100644 test/integration/filterPath/expected/.git_keep/objects/66/7b767bf067438c08d47c54fe756a34f238b90d create mode 100644 test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 create mode 100644 test/integration/filterPath/expected/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 delete mode 100644 test/integration/filterPath/expected/.git_keep/objects/d6/9102e71a2f400fe52feab06516e05cdaf7d0ba create mode 100644 test/integration/filterPath/expected/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b create mode 100644 test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 create mode 100644 test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de delete mode 100644 test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d delete mode 100644 test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 delete mode 100644 test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba create mode 100644 test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c create mode 100644 test/integration/filterPath2/expected/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 delete mode 100644 test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa delete mode 100644 test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 create mode 100644 test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 create mode 100644 test/integration/filterPath2/expected/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 delete mode 100644 test/integration/filterPath2/expected/.git_keep/objects/c1/a2676f74b3007ebb101d4d121cecb4850f1378 create mode 100644 test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 create mode 100644 test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 delete mode 100644 test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 delete mode 100644 test/integration/filterPath3/expected/.git_keep/objects/2c/7b461ce430e2d743ee239f0c994fd60f90c863 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 delete mode 100644 test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 delete mode 100644 test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 delete mode 100644 test/integration/filterPath3/expected/.git_keep/objects/a6/68d8690712ac945055bd187ed70fd10541dd38 delete mode 100644 test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d delete mode 100644 test/integration/filterPath3/expected/.git_keep/objects/e9/2eec6edb251fbc68435ffd5cd7a52f886f062d delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/05/a37c1f6dc7942f15f80d45254d38735918f670 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/2f/15f547118f3c3d9c81175825923e13ec6f0aa0 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/39/b895b8f8b050030fe6aaf6404c660f22b939e7 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/54/b6871251edf1636a77993925843c6294daa768 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/61/f5538c896ea41a0303368b24ab8e5dd6b0fba3 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/82/db6d0e4502f489719ea0f3dbe7e14413c6d28a create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/d762c119834784fdbf97e9bb3b4c15e804ebaa delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/c6/22516f02266679505b89103007ec04b8748b67 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 create mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 delete mode 100644 test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/32/129537d40d9fb35cf3dd6fba7985870142324b create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/41/7a3f75c440e565dab9b5afa78747ef37446348 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/5e/3a33cb09434849f7bbabaaad8386c9f0508eec create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a4/2af37388a9ad2eac85f71828cfc63262c90900 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a6/9f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/c5/507059e2aa65bc2dad65bd38b879079b69c48c create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ed/d4e2e50eb82125428b045c540a9194d934e180 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ee/b8990921f62a1ec3fc0be960c8068a24503ca8 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/5b/64b56ce78c5611173e73ee34cf0eb6fddac926 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/5c/021eb54f0eac90e22f363ee9214454a55b81de create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c create mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 delete mode 100644 test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 delete mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 delete mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 delete mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f delete mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/56/77dceabb2de40c648da3c831d037b429375131 delete mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/80/8f2484733488c2b6bd2f3773b04437bbb20434 delete mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/8a/fc5e59aed0d570b89e1a658641c02b604ce71d create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 delete mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/d0/ec73019f9c5e426c9b37fa58757855367580a5 create mode 100644 test/integration/patchBuilding2/expected/.git_keep/objects/e4/74bc2d1712ed5fdf14fb7223392f1b0dcc8d37 delete mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf delete mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c delete mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 create mode 100644 test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 create mode 100644 test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 create mode 100644 test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d create mode 100644 test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 delete mode 100644 test/integration/searching/expected/.git_keep/objects/aa/6ceb765f57224d1196d23b6ba65a767765a1c5 delete mode 100644 test/integration/searching/expected/.git_keep/objects/cb/b8acda2ebe17a088fc1f89251bd4d9b0397580 delete mode 100644 test/integration/searching/expected/.git_keep/objects/e4/48ece7cf84d19a78095018a271731cdcc2bb1b rename test/integration/{commit/expected/.git_keep/objects/47/912ceb0ffa9b205290e75103d9dd6b1878e87b => searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70} (58%) delete mode 100644 test/integration/searching/expected/.git_keep/objects/f1/b38f1bd77ac351d397a83dd0ec1325e8622c01 delete mode 100644 test/integration/searching/expected/.git_keep/objects/fb/01ecb35c6574bf41e689abec9afa337d22819e create mode 100644 test/integration/searching/expected/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 delete mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/1f/b49389c3ca6720391e91714cff34f842b56328 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 create mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a delete mode 100644 test/integration/searchingInStagingPanel/expected/.git_keep/objects/d4/31809a4ded1399fbe0203a92eca627d40c873a delete mode 100644 test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d create mode 100644 test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c delete mode 100644 test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e delete mode 100644 test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3 delete mode 100644 test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22 create mode 100644 test/integration/squash/expected/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 delete mode 100644 test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 create mode 100644 test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 create mode 100644 test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 create mode 100644 test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 create mode 100644 test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 delete mode 100644 test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa create mode 100644 test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 delete mode 100644 test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 create mode 100644 test/integration/tags/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/tags/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/tags/expected/.git_keep/HEAD create mode 100644 test/integration/tags/expected/.git_keep/config create mode 100644 test/integration/tags/expected/.git_keep/description create mode 100644 test/integration/tags/expected/.git_keep/index create mode 100644 test/integration/tags/expected/.git_keep/info/exclude create mode 100644 test/integration/tags/expected/.git_keep/logs/HEAD create mode 100644 test/integration/tags/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/tags/expected/.git_keep/objects/1d/2a22db54ab37b582dc5e3c4ca660f06cdb4692 create mode 100644 test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/tags/expected/.git_keep/objects/9d/577efe8be29a993269a0a737ca9c8321a2adc2 create mode 100644 test/integration/tags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/tags/expected/.git_keep/refs/heads/master create mode 100644 test/integration/tags/expected/.git_keep/refs/tags/tag1 create mode 100644 test/integration/tags/expected/.git_keep/refs/tags/tag3 create mode 100644 test/integration/tags/expected/.git_keep/refs/tags/tag4 create mode 100644 test/integration/tags/expected/file0 create mode 100644 test/integration/tags/expected/file1 create mode 100644 test/integration/tags/recording.json create mode 100644 test/integration/tags/setup.sh create mode 100644 test/integration/tags/test.json diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go index c97b4e5ff..7ddddd9a2 100644 --- a/pkg/integration/integration.go +++ b/pkg/integration/integration.go @@ -60,7 +60,7 @@ func RunTests( testPath := filepath.Join(testDir, test.Name) actualDir := filepath.Join(testPath, "actual") expectedDir := filepath.Join(testPath, "expected") - logf("testPath: %s, actualDir: %s, expectedDir: %s", testPath, actualDir, expectedDir) + logf("path: %s", testPath) // three retries at normal speed for the sake of flakey tests speeds = append(speeds, 1, 1, 1) @@ -91,6 +91,13 @@ func RunTests( if err != nil { return err } + err = os.Rename( + filepath.Join(expectedDir, ".git"), + filepath.Join(expectedDir, ".git_keep"), + ) + if err != nil { + return err + } } actual, expected, err := generateSnapshots(actualDir, expectedDir) @@ -262,22 +269,19 @@ func generateSnapshot(dir string) (string, error) { snapshot := "" - statusCmd := fmt.Sprintf(`git -C %s status`, dir) - statusCmdOutput, err := osCommand.RunCommandWithOutput(statusCmd) - if err != nil { - return "", err + cmdStrs := []string{ + fmt.Sprintf(`git -C %s status`, dir), // file tree + fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir), // log + fmt.Sprintf(`git -C %s tag -n`, dir), // tags } - snapshot += statusCmdOutput + "\n" + for _, cmdStr := range cmdStrs { + // ignoring error for now. If there's an error it could be that there are no results + output, _ := osCommand.RunCommandWithOutput(cmdStr) - logCmd := fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir) - logCmdOutput, err := osCommand.RunCommandWithOutput(logCmd) - if err != nil { - return "", err + snapshot += output + "\n" } - snapshot += logCmdOutput + "\n" - err = filepath.Walk(dir, func(path string, f os.FileInfo, err error) error { if err != nil { return err diff --git a/test/integration/branchAutocomplete/expected/.git_keep/index b/test/integration/branchAutocomplete/expected/.git_keep/index index 20f42788ed18a196673b0b3c83be6f95968a4edd..79e58d4f5c49991fb907b9489777cfc900a6efe8 100644 GIT binary patch delta 65 zcmbQpIFV7s#WTp6fq{Vuh#3>Iw=8GUNU(v?j0_AcY`W}gCaOe=yxwIA{J??Os#>@j0_AcY#MXzC#pn>*sG{L5xsk{Z2BD0 O$A#J%=QrguR{;PgCKM$A diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD b/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD index d3b3106be..8985b49b4 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 commit (initial): initial commit -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from master to one -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from one to two -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from two to three -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 checkout: moving from three to four -7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582245 +1000 checkout: moving from four to three +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 commit (initial): initial commit +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from master to one +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from one to two +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from two to three +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 checkout: moving from three to four +f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671338 +1000 checkout: moving from four to three diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master index a3dea40e4..3781b31e4 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 commit (initial): initial commit +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 commit (initial): initial commit diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two index 362d71331..f3e789f72 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two +++ b/test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two @@ -1 +1 @@ -0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI 1617582242 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI 1617671335 +1000 branch: Created from HEAD diff --git a/test/integration/branchAutocomplete/expected/.git_keep/objects/78/77532bb822c0e04f5ecbc78fc414f997ba53cf b/test/integration/branchAutocomplete/expected/.git_keep/objects/78/77532bb822c0e04f5ecbc78fc414f997ba53cf deleted file mode 100644 index 4c5832231408a00ded76e2da271321af02e9df56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmV->0EGW|0ga783WG2Z0DI0W_AZp&7!!q33Z8t%X1k#Q(}<+d=U4Cpy$&;s)KYQ- z8v0AyRUx`5J((o%#L2Tu7=6URR$@=A5=TK|FNQzuRd<*dxXsH$zg)IeuTsk$$Ws_b dYn_FT5YZg;m^A%UH~F1g<`vG)`~dd3FrH95Iwk-B diff --git a/test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d b/test/integration/branchAutocomplete/expected/.git_keep/objects/f7/53f4dfc98d148a7e685c46c8d148bcac56707d new file mode 100644 index 0000000000000000000000000000000000000000..a9bfbe5b4d641d656467512acc2b462505d9a29b GIT binary patch literal 122 zcmV-=0EPc}0ga783c@fD06pgwdlzKaw21|gLQj3h?z+K1V@iq8=UeatUWXY*Ybm(_ z_5Rd0GmvgbPbQ5#a0=Wdlpq-Ss^W=F<)%m+)bXdi>ITyc_h}w&=dvz#(OMorfntc{ ceGg|sM0e0*((F&&<#%qG7x;DV3-@&}qC*BcYybcN literal 0 HcmV?d00001 diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two index cfe30fbef..7303bd10b 100644 --- a/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two +++ b/test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two @@ -1 +1 @@ -7877532bb822c0e04f5ecbc78fc414f997ba53cf +f753f4dfc98d148a7e685c46c8d148bcac56707d diff --git a/test/integration/commit/expected/.git_keep/index b/test/integration/commit/expected/.git_keep/index index b712be28acb608aa9d6b506bb8d4b1d81e3f76c8..6bda11a963f4c74fd653e4a7b665088e83a5a447 100644 GIT binary patch delta 174 zcmZ3lGLRIAhDv2j+ya&|JsfHQk^<3Csmh6ez*6Q8m!&~cAQ~#wHQ9wRP-KVL XovOXgQ3Q delta 174 zcmZ3DBLf2qn?~+}i7JNTKq>j)WkMh+5Dk^u zJ~0O@rI0_z8zcpyp;9L%ZUIXvHZxuWNr7mn)Xj;1z*0(UYF2@yKr~e9)npgOK#}Uj X6PAa{Jgf^jb?WWU%{($a4B0CH`MfiB diff --git a/test/integration/commit/expected/.git_keep/logs/HEAD b/test/integration/commit/expected/.git_keep/logs/HEAD index 0583e2f0b..66475b1c1 100644 --- a/test/integration/commit/expected/.git_keep/logs/HEAD +++ b/test/integration/commit/expected/.git_keep/logs/HEAD @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 47912ceb0ffa9b205290e75103d9dd6b1878e87b CI 1617580570 +1000 commit (initial): myfile1 -47912ceb0ffa9b205290e75103d9dd6b1878e87b 6bd1486e023f9853f9e6f611cac5ccbc8960ce57 CI 1617580570 +1000 commit: myfile2 -6bd1486e023f9853f9e6f611cac5ccbc8960ce57 980224a1dd75d91fdcab11edc8d25c3ff8f751ba CI 1617580570 +1000 commit: myfile3 -980224a1dd75d91fdcab11edc8d25c3ff8f751ba f4e779d1bd2ad074259ad763210f5b911337054f CI 1617580570 +1000 commit: myfile4 -f4e779d1bd2ad074259ad763210f5b911337054f d0cab53ed70fc66096575c2ccd7ef150b4b470e8 CI 1617580572 +1000 commit: commit +0000000000000000000000000000000000000000 3df3d8761bc0f0828596b11845aeac175b7b7393 CI 1617671339 +1000 commit (initial): myfile1 +3df3d8761bc0f0828596b11845aeac175b7b7393 a7d53cc21fd53100f955377be379423b0e386274 CI 1617671339 +1000 commit: myfile2 +a7d53cc21fd53100f955377be379423b0e386274 4ba4f1ed711a9081fab21bc222469aa5176a01f8 CI 1617671339 +1000 commit: myfile3 +4ba4f1ed711a9081fab21bc222469aa5176a01f8 1440bc6cc888a09dca2329d1060eec6de78d9d21 CI 1617671339 +1000 commit: myfile4 +1440bc6cc888a09dca2329d1060eec6de78d9d21 e7560e2cd4783a261ad32496cefed2d9f69a46e7 CI 1617671342 +1000 commit: 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 index 0583e2f0b..66475b1c1 100644 --- a/test/integration/commit/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/commit/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 47912ceb0ffa9b205290e75103d9dd6b1878e87b CI 1617580570 +1000 commit (initial): myfile1 -47912ceb0ffa9b205290e75103d9dd6b1878e87b 6bd1486e023f9853f9e6f611cac5ccbc8960ce57 CI 1617580570 +1000 commit: myfile2 -6bd1486e023f9853f9e6f611cac5ccbc8960ce57 980224a1dd75d91fdcab11edc8d25c3ff8f751ba CI 1617580570 +1000 commit: myfile3 -980224a1dd75d91fdcab11edc8d25c3ff8f751ba f4e779d1bd2ad074259ad763210f5b911337054f CI 1617580570 +1000 commit: myfile4 -f4e779d1bd2ad074259ad763210f5b911337054f d0cab53ed70fc66096575c2ccd7ef150b4b470e8 CI 1617580572 +1000 commit: commit +0000000000000000000000000000000000000000 3df3d8761bc0f0828596b11845aeac175b7b7393 CI 1617671339 +1000 commit (initial): myfile1 +3df3d8761bc0f0828596b11845aeac175b7b7393 a7d53cc21fd53100f955377be379423b0e386274 CI 1617671339 +1000 commit: myfile2 +a7d53cc21fd53100f955377be379423b0e386274 4ba4f1ed711a9081fab21bc222469aa5176a01f8 CI 1617671339 +1000 commit: myfile3 +4ba4f1ed711a9081fab21bc222469aa5176a01f8 1440bc6cc888a09dca2329d1060eec6de78d9d21 CI 1617671339 +1000 commit: myfile4 +1440bc6cc888a09dca2329d1060eec6de78d9d21 e7560e2cd4783a261ad32496cefed2d9f69a46e7 CI 1617671342 +1000 commit: commit diff --git a/test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 b/test/integration/commit/expected/.git_keep/objects/14/40bc6cc888a09dca2329d1060eec6de78d9d21 new file mode 100644 index 0000000000000000000000000000000000000000..0a95d28bae8abcba5484fa73a3e3d76c33c3b057 GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeKzJY&Hpq2tD-~o4Ub5V@rvkzqe2DItoanoV|nbxTF4qCO&`WJp-0I4qNMjyQ`1 zj4XgP8F}~Ty4zv2*I~TtN7}aNWm?&AoA#~qqGW!}&p54z C&qbmD literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 b/test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 new file mode 100644 index 000000000..9abdddbd3 --- /dev/null +++ b/test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393 @@ -0,0 +1,3 @@ +xA +0@Q9iI +"BW=FL!R"~r*Jd ¬D "\S.0p~6fw LzLɝ})2r, \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 b/test/integration/commit/expected/.git_keep/objects/4b/a4f1ed711a9081fab21bc222469aa5176a01f8 new file mode 100644 index 0000000000000000000000000000000000000000..b67f58f76d26498fb15db07dcc131d697aac0c70 GIT binary patch literal 149 zcmV;G0BZku0gaA93d0}}MZ5MC?hD0n)KMs@yKkU4uUZ?d5=Uzkdm`l zj9?6woXYS1*bY6-`Z~>b`Q)}g<-%LLX$U}p05R$FxG-w0BdW`vx@zCLJ_Xee)h{{> DsryJu literal 0 HcmV?d00001 diff --git a/test/integration/commit/expected/.git_keep/objects/6b/d1486e023f9853f9e6f611cac5ccbc8960ce57 b/test/integration/commit/expected/.git_keep/objects/6b/d1486e023f9853f9e6f611cac5ccbc8960ce57 deleted file mode 100644 index 93473ae5999809bdbde8c2a91f4423cef3b82bd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gcW<3c@fDKvCB@MfQTsOp{3lM1-z-jHH=h!PrtF=O057G)9>~);(`blkj>SbQr%_3v)5qto9MgTB}9#dWa%uV~&<*8(Tw#hm9 DXw6G7 diff --git a/test/integration/commit/expected/.git_keep/objects/98/0224a1dd75d91fdcab11edc8d25c3ff8f751ba b/test/integration/commit/expected/.git_keep/objects/98/0224a1dd75d91fdcab11edc8d25c3ff8f751ba deleted file mode 100644 index ff762551a3a8a4eb58520664a81e8a1b7d37833f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaAL3c@fDMqTF=*$Xn$$zMT4=&Hv^rZZSDwv-5ZdvgRg--E|ne7x1V zHjAS>wL`=X1tW0^xTqu2>_{~)NSc6CAspCuvY0&|@@h7e1zidP1L>H29|;-|IroqY zr!fGFk0!s{V>|3L+v_yn<&*3FlnZb5W-(y&348>5MgTC~_ESy%%uW63`V=xhK3h8k D+e1Om diff --git a/test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 b/test/integration/commit/expected/.git_keep/objects/a7/d53cc21fd53100f955377be379423b0e386274 new file mode 100644 index 0000000000000000000000000000000000000000..77d08ca033ce47579d83912b9c8c07a2749684bf GIT binary patch literal 150 zcmV;H0BQet0gcX03c@fDKw;N8MfQSZGRY(ZB0^U^Mt&w(Ft(HkdV6~Ww~ue}%G&!f zG_X63T|}pV4wC0)Y87crEW|AnQnW=$SG=bUsNc z5PS|fAfrm}@mO~~&H6gcclo5gJ>^o?e$zk@C;%esGZz>% diff --git a/test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 b/test/integration/commit/expected/.git_keep/objects/e7/560e2cd4783a261ad32496cefed2d9f69a46e7 new file mode 100644 index 0000000000000000000000000000000000000000..9eb3492d1ef93493ac40d908795b4f14bf9b57b7 GIT binary patch literal 145 zcmV;C0B-+y0gaA93c@fD06pgwxeKzpiAf3~LQj3hW_OE%v86=t`S#!gybd!kvb6T- z9*1z~o0$*5C>&zJSxo}Pa|L2!nQJE1*@$BZ)!fRPz4kChsFFlVDGY-OQ=mZ+5|~L+ z%S8tzbo}o3W%J|YFXMEx54ZJcCt2FnW5S#=hDiR10N{4IPj&lK|M~6Ybk-zj0_AcY`R<$6ICq5v$t&J6P)=BC)Rk=bm9WYOb`tv^EUvE{fO23OD(5ztg&Ab-eydZ9)sHtA)ww(;H{s=RXgc&Ey9F_ojRV delta 376 zcmeyu{e@e_#WTp6fq{VuhE4eW{|lS3NOM=1LeRpRIYn+ u2w2XV|F}jCP!3E(<@z@-VYXosdE5SR&)!b!tAd#_Z*(Lt?HAcL?KS}PyKy1_ diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD index ea46cdc88..cb32732a9 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD @@ -1,8 +1,8 @@ -0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI 1617582376 +1000 commit (initial): one -459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt -0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI 1617582376 +1000 commit: two -837fbbc4ee6892b828a4a94be22c39814146aafb 459fa5065afddb89a3dccddef39b17b5fd74d041 CI 1617582376 +1000 checkout: moving from conflict to conflict_second -459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt -3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI 1617582377 +1000 commit: three -3633f8c997d88e0c59202f498c8344da9da3aaf4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI 1617582377 +1000 reset: moving to conflict_second -3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second +0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 commit (initial): one +98e834e9cdae1191de7fafb2b6f334bddd0793e8 9976d7948def8b082e9d20135d6a04624d711752 CI 1617671344 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt +9976d7948def8b082e9d20135d6a04624d711752 8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e CI 1617671344 +1000 commit: two +8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 checkout: moving from conflict to conflict_second +98e834e9cdae1191de7fafb2b6f334bddd0793e8 c91b3b139ea108475c19839fcda3a4e33db4ccc9 CI 1617671344 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt +c91b3b139ea108475c19839fcda3a4e33db4ccc9 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI 1617671344 +1000 commit: three +11bdfc142c42c6ffaa904890ab61ec76262ec9ca 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI 1617671344 +1000 reset: moving to conflict_second +11bdfc142c42c6ffaa904890ab61ec76262ec9ca 854f08fa802293e0679d07771547fe9fe5d159e8 CI 1617671365 +1000 commit (merge): Merge branch 'conflict' into conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict index 692e2161e..ba5017ea9 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI 1617582376 +1000 commit (initial): one -459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt -0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI 1617582376 +1000 commit: two +0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 commit (initial): one +98e834e9cdae1191de7fafb2b6f334bddd0793e8 9976d7948def8b082e9d20135d6a04624d711752 CI 1617671344 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt +9976d7948def8b082e9d20135d6a04624d711752 8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e CI 1617671344 +1000 commit: two diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second index b0bd0abaa..d7cdb2c6e 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second @@ -1,4 +1,4 @@ -0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI 1617582376 +1000 branch: Created from conflict -459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt -3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI 1617582377 +1000 commit: three -3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second +0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI 1617671344 +1000 branch: Created from conflict +98e834e9cdae1191de7fafb2b6f334bddd0793e8 c91b3b139ea108475c19839fcda3a4e33db4ccc9 CI 1617671344 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt +c91b3b139ea108475c19839fcda3a4e33db4ccc9 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI 1617671344 +1000 commit: three +11bdfc142c42c6ffaa904890ab61ec76262ec9ca 854f08fa802293e0679d07771547fe9fe5d159e8 CI 1617671365 +1000 commit (merge): Merge branch 'conflict' into conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 b/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 deleted file mode 100644 index d3e23bef3a23e6e1d357b876d33966f0c50a3e47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmV;n07?IN0gcX0io-ArhT*P#3hjp!Iq^>nWfER1d0gGnQ{r)Vyb9ub)!%wUt^LWAx#C7MDw6sRt4u%C6B>VWzKV=iA!OY zI;Cu5_LZY!bk@*Imu-jh1y1M7pS-C(?s6nPMd7UWw z*fODF%DFOCPRuPod`zW@Xf~UXqF_YMOnHn)O@twbJP%(S|McsA!1)5N=gYhO@_N77 zi|*?iggKN6W1<4j!F%sUJ5F@_r|v%N_%e`#H@(71_pRL)?I&2azQY4Qziq_o{s4=# FR=U<@XS4tS diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 b/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 deleted file mode 100644 index 707cdfc06..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 +++ /dev/null @@ -1,3 +0,0 @@ -x -0 a}IT1ikǨG[ww52ZJbt-n`h; e$ă - QI?yho?P* \ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb b/test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb deleted file mode 100644 index 63bd1c8d9c6095ca305b2f7cbcd79fc4c4c04767..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93IZ_PX&X_nb{Hype0u~pfAM$^er~ls zI#9$z-&KKfbRi^EN^5m znQu}eNig#6_qM~b!g*P*`jxsp^^{w^05SPF*vT^-2@%bp<5br_b<;o1`~VM`IZ3T7 BLEZoW diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/85/4f08fa802293e0679d07771547fe9fe5d159e8 b/test/integration/discardFileChanges/expected/.git_keep/objects/85/4f08fa802293e0679d07771547fe9fe5d159e8 new file mode 100644 index 0000000000000000000000000000000000000000..58a92001e3b9099c7a324da482d88edc7170ea11 GIT binary patch literal 201 zcmV;)05<=40gaEnY6CG4gj4G&wsR2(THWanLI}8Wk!J|It5tm9I~hfRJbu);4@@!h z@iilD-?srS=BLqB!Dp$FW1^agIIRg67Pc&j)x}y$b{N>Pxl`9;03w$vxH_2$wGw5! zrfi7=s>I-eQ^`UPKS^>^!o?@iAf+&2E<>^JTdg2y7|!lrNEsIxxz`>QE!`!6Kuz5@R*<9I%_e1no3wS DiEd%_ literal 0 HcmV?d00001 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e b/test/integration/discardFileChanges/expected/.git_keep/objects/8c/82faa1358ce6cddba19d59b2924cbcc5ef1c8e new file mode 100644 index 0000000000000000000000000000000000000000..8f0db8b46852f859c8ea62b06f1c460bc0dd0fc1 GIT binary patch literal 147 zcmV;E0Brww0gaAJ3IZ_@1zqP9*$dL0^yC8~!mQ>PNxDVBm?1>;_~r<1-lC|2S6Z!) zp)tZ?bPvXiEIGv!Y%40gcT;3WGolK+&$}6xjC+s}iaYANpq z#PQa4cjyr{jR|$l1Dct}l`>^TcFk@QBeRGO!G7&kcbFG=%**6|E8EBKsg@^@kcv{z W3>_h2IO{oSevyaz^>6@AL@MSxYc~M^ literal 0 HcmV?d00001 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 b/test/integration/discardFileChanges/expected/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 new file mode 100644 index 000000000..c5f360872 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752 @@ -0,0 +1 @@ +xAj0E)f_4*YJ!c uo{ū[7)7 s GK12Q1\UY2ؼEU] O[.W:__xIq[$bbsn81eg>͖QqAO2:֤C鶒BG[Ǻ}/~L \ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 b/test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 new file mode 100644 index 000000000..7744b72d7 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9 @@ -0,0 +1,2 @@ +xK0)z?8gɂ0 dcH8@? {< +Mz} qdlpka4 GԩؤN=U(MGaL28f|afäKmN޹=8֭ &h~ZG Udw(on+%W ڐ|=?XK. \ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict index 4a6184f26..5984d595a 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict +++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict @@ -1 +1 @@ -837fbbc4ee6892b828a4a94be22c39814146aafb +8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second index 79ace5379..f7790393b 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second +++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second @@ -1 +1 @@ -39d62c8a07e5103fef16c32373738ce92c4549b7 +854f08fa802293e0679d07771547fe9fe5d159e8 diff --git a/test/integration/filterPath/expected/.git_keep/index b/test/integration/filterPath/expected/.git_keep/index index c1d9597bd905a0dd5a051405b81ecffdeccf3a4b..168285e76b0e028c3212ef80df2f4fd56e646d34 100644 GIT binary patch delta 116 zcmbQqG?Pii#WTp6fq{Vuh?x_zw;UIgSgHl185tN@*mSuqC#o2UZ8^@9de9go1EL`^ wTyG}k7>RB<%_04>87Kp$p?W564iX7pZnne5zt?L>*SPrH(xKAxKi0G3Q98~^|S delta 116 zcmbQqG?Pii#WTp6fq{Vuh?x_z=ll{lxFZ}!Gcqu+u<10JO;j-woAZlD?#EM*42Xuv xG`^geV5F!lJx2)-QXV*e~4p4*)G2E@1!w diff --git a/test/integration/filterPath/expected/.git_keep/logs/HEAD b/test/integration/filterPath/expected/.git_keep/logs/HEAD index 1f153be50..808615246 100644 --- a/test/integration/filterPath/expected/.git_keep/logs/HEAD +++ b/test/integration/filterPath/expected/.git_keep/logs/HEAD @@ -1,7 +1,7 @@ -0000000000000000000000000000000000000000 4c2d0500178f2642effb990e6d65e073022bf50b CI 1617665274 +1000 commit (initial): file0 -4c2d0500178f2642effb990e6d65e073022bf50b 0315577613e2e65683d0dcf3371940a44ea073ca CI 1617665274 +1000 commit: file1 -0315577613e2e65683d0dcf3371940a44ea073ca 5fbbe6422fb135ada1a05b15f61369747d4e6842 CI 1617665274 +1000 commit: file2 -5fbbe6422fb135ada1a05b15f61369747d4e6842 f712b0a288ced6c49e6cfcf16f7af0991e50849d CI 1617665274 +1000 commit: file1 and file2 -f712b0a288ced6c49e6cfcf16f7af0991e50849d 5192ae05adf946800910d092fb406eb04d56a578 CI 1617665274 +1000 commit: file -5192ae05adf946800910d092fb406eb04d56a578 667b767bf067438c08d47c54fe756a34f238b90d CI 1617665282 +1000 commit: asd -667b767bf067438c08d47c54fe756a34f238b90d d69102e71a2f400fe52feab06516e05cdaf7d0ba CI 1617665289 +1000 commit: test +0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI 1617671367 +1000 commit (initial): file0 +f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI 1617671367 +1000 commit: file1 +4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI 1617671367 +1000 commit: file2 +d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI 1617671367 +1000 commit: file1 and file2 +f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI 1617671367 +1000 commit: file +8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI 1617671375 +1000 commit: asd +af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI 1617671383 +1000 commit: test diff --git a/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master index 1f153be50..808615246 100644 --- a/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/filterPath/expected/.git_keep/logs/refs/heads/master @@ -1,7 +1,7 @@ -0000000000000000000000000000000000000000 4c2d0500178f2642effb990e6d65e073022bf50b CI 1617665274 +1000 commit (initial): file0 -4c2d0500178f2642effb990e6d65e073022bf50b 0315577613e2e65683d0dcf3371940a44ea073ca CI 1617665274 +1000 commit: file1 -0315577613e2e65683d0dcf3371940a44ea073ca 5fbbe6422fb135ada1a05b15f61369747d4e6842 CI 1617665274 +1000 commit: file2 -5fbbe6422fb135ada1a05b15f61369747d4e6842 f712b0a288ced6c49e6cfcf16f7af0991e50849d CI 1617665274 +1000 commit: file1 and file2 -f712b0a288ced6c49e6cfcf16f7af0991e50849d 5192ae05adf946800910d092fb406eb04d56a578 CI 1617665274 +1000 commit: file -5192ae05adf946800910d092fb406eb04d56a578 667b767bf067438c08d47c54fe756a34f238b90d CI 1617665282 +1000 commit: asd -667b767bf067438c08d47c54fe756a34f238b90d d69102e71a2f400fe52feab06516e05cdaf7d0ba CI 1617665289 +1000 commit: test +0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI 1617671367 +1000 commit (initial): file0 +f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI 1617671367 +1000 commit: file1 +4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI 1617671367 +1000 commit: file2 +d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI 1617671367 +1000 commit: file1 and file2 +f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI 1617671367 +1000 commit: file +8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI 1617671375 +1000 commit: asd +af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI 1617671383 +1000 commit: test diff --git a/test/integration/filterPath/expected/.git_keep/objects/03/15577613e2e65683d0dcf3371940a44ea073ca b/test/integration/filterPath/expected/.git_keep/objects/03/15577613e2e65683d0dcf3371940a44ea073ca deleted file mode 100644 index bff83ef7b7c843ddba9d8908c68f38c9ff80e1fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@#q0%{Op=KK5uvLdBbiLFU~DN7Jia}G+s|8kS$kgw z*hHtXt3t)dB1r^OmYk_NZbf2Fp;f2kkbUy(t=aOf?*U$@VnDR<+K4@AYb7OAt{fDj zL!#0G7Lz~Yx$ZE{aGU0beskYmdXcr?!Lp6afue`AMMQJdV`}K1+_dGT*8Bi@HEfJ(v5;~hOq^oZ=T?_sDf(i7!T2q z;UGJauCYa%dZ?aq=VrlBgUlxQ%r>;_YeXbZYAZXvL>G3%0jG_rSIU-WX;Q)1d*I{( zd)GZBRX%cGcYRy*`L~E1|cjAFEb6JnorA AumAu6 literal 0 HcmV?d00001 diff --git a/test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 b/test/integration/filterPath/expected/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 new file mode 100644 index 0000000000000000000000000000000000000000..1ea243810ba144fd7fc5cfebe114c24aa24f4d70 GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQSZGWlshMChu=m`o;EXiO;)Jia}G+sC(f+*@0R zhGZ|}5YffNz?_&(A||p0L(Lp1`C3pcn&6TP4%AMEyoat>lB)#8Wx&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;>0^Q YSg&*yW;SO%CmnxsQPTJQL)QQ{n`DVt3bKoWd}e?(q-tUW z@rGP1Dt*Rl?|NSJeO{jOP3_p^#(R5cKnRH52B)uJj8P{&r-uBgtGaHYer^&uvTb@s Ad;kCd diff --git a/test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842 b/test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842 deleted file mode 100644 index cb982ff10..000000000 --- a/test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842 +++ /dev/null @@ -1,5 +0,0 @@ -xK -0 )/KHR -Y-@҄B_mK0ढ़vPf!W2RP\Kt@I+39c6ny(W=g1idԯlǪo SD - -9~韸˪h~a96 \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/objects/66/7b767bf067438c08d47c54fe756a34f238b90d b/test/integration/filterPath/expected/.git_keep/objects/66/7b767bf067438c08d47c54fe756a34f238b90d deleted file mode 100644 index a53d114d71942497a5022c2179c90933087aea60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0gcW<3c@fDKvCB@MfQTsgw7-bQiQI0jA=4K!PrtGczk;Vx1YE8d2Q{{ zJqn!qZsvojL?sSLm9;D;f~FNpu8cWC;*`LY+@`y|x+j#N2Bf9RzzIMQ3P`BS0Bj2k zg;*&jr=NabcR$VkI?XrxYTKT6$!i-uGDc)SY$B5y=& diff --git a/test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 b/test/integration/filterPath/expected/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 new file mode 100644 index 0000000000000000000000000000000000000000..8e06bcc670c4366e1a3908903e6dd097c2328202 GIT binary patch literal 146 zcmV;D0B!$x0gaAJ3c@fDKwak)vlk>Y`GbhiRgaNOCs=4qDG@xrJ%YQ(<1HTd*46=- z@G=e&h_*yB3%kmRDpwt)M2^n7fSwGo*i;tl)SeG{52$1#(vr1tnefEImV?n4jZK-U z>gASces-rjx^%g>5 literal 0 HcmV?d00001 diff --git a/test/integration/filterPath/expected/.git_keep/objects/d6/9102e71a2f400fe52feab06516e05cdaf7d0ba b/test/integration/filterPath/expected/.git_keep/objects/d6/9102e71a2f400fe52feab06516e05cdaf7d0ba deleted file mode 100644 index 442dcf72088aaa85f4762f527d4c63717708e1ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0?ltE&)7A*Vb;*OeA(6H*I(etkl(!!QhQtv$Ln z(VY4rqBAksP+UfdrLr|3Y+?n6v0BFwGkGs4YEOr}y7rz1pA_9WeŪ:6 \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 b/test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 new file mode 100644 index 000000000..de38ddd8b --- /dev/null +++ b/test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 @@ -0,0 +1,2 @@ +xK +0@]$$ "tcL zw[6w0\!DHQs*'LKveA&Q;v(dl(Fj[}5rL>I񻿶}[0 BV=:/k_b; \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de b/test/integration/filterPath/expected/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de new file mode 100644 index 0000000000000000000000000000000000000000..cb9dd46d07eaf88727420e6525632b9cf2c85606 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{Nyo&1h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ01^yvK7|l+lDl^?3&4+5w6ION*Z>Wx*2G``w2j7zp5ye!9_x3-ZEp2N;>0^I YgY$G1W;SO%CmnxsQ^zf}XdjJ3c literal 0 HcmV?d00001 diff --git a/test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d b/test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d deleted file mode 100644 index cff47c2b4..000000000 --- a/test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$3DzI2BӖ[ox> cԜ#jB%j Z -BjC$Մ&7qwm)n"C%oZkus˟"/+<| \ No newline at end of file diff --git a/test/integration/filterPath/expected/.git_keep/refs/heads/master b/test/integration/filterPath/expected/.git_keep/refs/heads/master index ab6a49afb..6e1574559 100644 --- a/test/integration/filterPath/expected/.git_keep/refs/heads/master +++ b/test/integration/filterPath/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -d69102e71a2f400fe52feab06516e05cdaf7d0ba +22adc4567aba3d1a0acf28b4cef312922d516aeb diff --git a/test/integration/filterPath2/expected/.git_keep/index b/test/integration/filterPath2/expected/.git_keep/index index 9af85a58ccdc327bcc94c95f5659610525aff504..1f806870633df427b39fbbe0b64d73241aec450f 100644 GIT binary patch delta 146 zcmaFJ^pHu##WTp6fq{Vuh*=V{x7<)MimHXtj6g9qT^_@Ue^e)W@``P_A)m0z9V7{& zA(GrrC*~N5ZFymsy4wOM1E!(cd?s!I%G^*E^VkE@1EQfaJQM!}iiG?Wn=`d5gm-DV P#O@}>t4j`L3Ht#6Rr4`d delta 146 zcmaFJ^pHu##WTp6fq{Vuh*=V{R}1spU%UfGGXllfbk>_q{G&S2lUHoDFo*TRpCCyP z4Ut^;a$=5=*lJ}Fg+G!&888ji7Bq1SP)3-0zu$L|9uN(c5uErZP-M=fw55i=-zHQq P=w06&p76uPW6@avZ-O(O diff --git a/test/integration/filterPath2/expected/.git_keep/logs/HEAD b/test/integration/filterPath2/expected/.git_keep/logs/HEAD index 86d311d47..3875aa5f3 100644 --- a/test/integration/filterPath2/expected/.git_keep/logs/HEAD +++ b/test/integration/filterPath2/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI 1617668883 +1000 commit (initial): file0 -36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI 1617668883 +1000 commit: file1 -7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI 1617668883 +1000 commit: file2 -f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI 1617668883 +1000 commit: file1 and file2 -914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI 1617668883 +1000 commit: file -23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI 1617668905 +1000 commit: test +0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI 1617671384 +1000 commit (initial): file0 +703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI 1617671384 +1000 commit: file1 +a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI 1617671384 +1000 commit: file2 +6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI 1617671384 +1000 commit: file1 and file2 +c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI 1617671384 +1000 commit: file +e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI 1617671407 +1000 commit: test diff --git a/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master index 86d311d47..3875aa5f3 100644 --- a/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI 1617668883 +1000 commit (initial): file0 -36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI 1617668883 +1000 commit: file1 -7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI 1617668883 +1000 commit: file2 -f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI 1617668883 +1000 commit: file1 and file2 -914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI 1617668883 +1000 commit: file -23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI 1617668905 +1000 commit: test +0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI 1617671384 +1000 commit (initial): file0 +703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI 1617671384 +1000 commit: file1 +a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI 1617671384 +1000 commit: file2 +6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI 1617671384 +1000 commit: file1 and file2 +c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI 1617671384 +1000 commit: file +e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI 1617671407 +1000 commit: test diff --git a/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 b/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 deleted file mode 100644 index 96fc3d97b314e6260d9cb01529933d660678b5b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3d0}}K+&!}h5JHrbkq?_DP)ynB;yPX#3lp_J$`e9Za;7Fd24Oy z77ASYAz}$<@}Y86E?!w3$xKWUV}|5|XTdU8jAow>d3Rd?E2*l_88SI4-a+w|5o3s) z0TiKfj%NDw*LK)pwD)0r%6Dq}DmUKR!$N|b5)lP^1?QYO>p9isPi}Ns#ry!zzBq6% CheDA6 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba b/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba deleted file mode 100644 index 012d9528a3f5e88744e39d1181dc79d2af7ffaa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10gcT~3c@fDhGEw^#q0%{Nyq$vh|pD!ku+bh(9lvMczk;Vw=WO8^VZtZ zNmMWW07x*v`5a>`S?=DYA^?Y6wX)5n+6axR)}&8=ZwHMNJ;v#UZ)*FB+q|_Wi4*T! Z2w|YBFta)9IqCS5o4TxE^8?>`EC$9)JMsVk diff --git a/test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c b/test/integration/filterPath2/expected/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c new file mode 100644 index 0000000000000000000000000000000000000000..6381fde43069dd6b10fb51c7945b7fd7f9439f39 GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-U~%n&8|>NA*VcJ)s+Tf4Z%X6-#nq$VHhU&*4CkI zgv&TYbQB^+Q!*8TQh;l!B^Zm7R3x!P;8KRHc0S}iG>2@0V`M+2EPxoKB!`wGb3_k5 z1rMB1@n^jHq31>4=jAD1Zu=&;+}lIj>CB^brapIkq YVN|*bGn=!Xla4>RDeDF{Kiokp@>oANV*mgE literal 0 HcmV?d00001 diff --git a/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa b/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa deleted file mode 100644 index aaaac7f83..000000000 --- a/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=BqԌR*q؄`ǯG֮쥟"l(qJ8C'у:)"(mpeHxkN*}k?<ڱɍЀcN_FS]䪮d9O \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 b/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 deleted file mode 100644 index 6aad407846085a6aa00c97ca354b6ae4d313c6aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmV;J0B8Sr0gaA93c@fD06pgwdlw{|rpX3Ggr540HQB{N)0Ps!=iC0k+c3;w@>=WE zz*%=`y9mUXicl9AEoX{JIbl*yr7zj5&w|)H5@$BvWoe)x+IaS{B&LA!Qc+C~+4oX> zmy35PiyHp4_qxL{!hIN@^5weCa?5Ld00xX95K#wLwAPx#9#c*J%#BX7An;P)BximK Gf<0^!VoGuV diff --git a/test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 b/test/integration/filterPath2/expected/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 new file mode 100644 index 0000000000000000000000000000000000000000..59f937373459e5fc468132838a78db7d881b69eb GIT binary patch literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MfQTsB$=56M1-z-j3iD_Ft*eP9^W3p?dL6iU3z~E ziwO^7Q?)g6q`-k91C~?;i*Sj_w*(HfHVHuFqFM8%uVGcHD>nd7EDkvO8H>$a|Q z^O(b>9cI1&lWJClEGiO8q&g`}?rMn^B2dbS61rUudpFMzD+6WhyAU|^Od*O)!dfP< zj>K3<37mY|Ydicf`ui|G?JMiP*iE(kIxG$TXW_zCItA0ygpL&v|Un~+PBF+%)5dpyLb)OpgCpSai!~6hHH#hDh CO-9ZD diff --git a/test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 b/test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 new file mode 100644 index 000000000..a47a39706 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 @@ -0,0 +1,2 @@ +xK +0 )/vlJ)dc(L\ޠ0Oe8.PrQѲPʕ3tEB #ufCQ(Yэ*Ύ|HA$S?d[SL)穦N"Zො̈< \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 b/test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 new file mode 100644 index 000000000..bfd62d1d3 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 @@ -0,0 +1,3 @@ +xA + @Ѯ=BqtJ)dc:@lB7Gl/CC8D4a&j$J3$ +yu\ѫy}kM!!Eq L?z}徯r+[hCG`Qg=U[VQ?9 \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef b/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef deleted file mode 100644 index def7bfe3a..000000000 --- a/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef +++ /dev/null @@ -1,2 +0,0 @@ -xA -0a9$i2#`Dn?Z8K;UaT0 9RdDD/w$^;p!DL#D0/ ݲɟOfOSx><\ZkSMMY7u'p: \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/refs/heads/master b/test/integration/filterPath2/expected/.git_keep/refs/heads/master index 4c86c3b07..72fc50fcc 100644 --- a/test/integration/filterPath2/expected/.git_keep/refs/heads/master +++ b/test/integration/filterPath2/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -c1a2676f74b3007ebb101d4d121cecb4850f1378 +92ec47058a2894afbbbd69c5f79bff20c503e686 diff --git a/test/integration/filterPath3/expected/.git_keep/index b/test/integration/filterPath3/expected/.git_keep/index index 9dbc3068bf1d80e1da2a09a9cc6846258f0aa575..01d83d7537bc74b1f71dc8496e3581575187bfa2 100644 GIT binary patch delta 146 zcmaFJ^pHu##WTp6fq{Vuh*=V{w|wM}^Vtrg8G&MKy1c>@|ENy%9Smq9uN)H^KRmwKoRZRHJ29sX^UY@ P7R}nk;ny;E$|?o`BWpCA delta 146 zcmaFJ^pHu##WTp6fq{Vuh*=V{S6A^GX*0uUMxYp*&X(;H|ENy% 1617668986 +1000 commit (initial): file0 -e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI 1617668986 +1000 commit: file1 -76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI 1617668986 +1000 commit: file2 -a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI 1617668986 +1000 commit: file1 and file2 -2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI 1617668986 +1000 commit: file -ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI 1617669005 +1000 commit: test +0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI 1617671409 +1000 commit (initial): file0 +8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI 1617671409 +1000 commit: file1 +c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI 1617671409 +1000 commit: file2 +72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI 1617671409 +1000 commit: file1 and file2 +b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI 1617671409 +1000 commit: file +231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI 1617671428 +1000 commit: test diff --git a/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master index c84dc4885..96c158987 100644 --- a/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 e92eec6edb251fbc68435ffd5cd7a52f886f062d CI 1617668986 +1000 commit (initial): file0 -e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI 1617668986 +1000 commit: file1 -76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI 1617668986 +1000 commit: file2 -a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI 1617668986 +1000 commit: file1 and file2 -2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI 1617668986 +1000 commit: file -ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI 1617669005 +1000 commit: test +0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI 1617671409 +1000 commit (initial): file0 +8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI 1617671409 +1000 commit: file1 +c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI 1617671409 +1000 commit: file2 +72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI 1617671409 +1000 commit: file1 and file2 +b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI 1617671409 +1000 commit: file +231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI 1617671428 +1000 commit: test diff --git a/test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 b/test/integration/filterPath3/expected/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 new file mode 100644 index 0000000000000000000000000000000000000000..13b3042dc5b2e4c926f4e7a921fcd71d1450710d GIT binary patch literal 147 zcmV;E0Brww0gcW}3c@fDfMM4;MfQTs>D3V>k z<`4|WN-BNEYdiEb>-#i6<(vAx%B^hup)p_#5go9;A^@nfo>N2qGp0gaAL3c^4PMqSS-vKJ(o&QAtJgswbBoMf7^ zlrRQT9oWgcKb8%~8=S}6)jl$>Pdn9Rz5pf4d!}%LBO#*O>3*u)pSo+)(+K3H@LS$} I0eDb6MB55QoB#j- diff --git a/test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 b/test/integration/filterPath3/expected/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 new file mode 100644 index 0000000000000000000000000000000000000000..d1ad09fbd474faad4e86e0230a526b96477f5e53 GIT binary patch literal 148 zcmV;F0Biqv0gaA93d0}}0DJZo-V0@S6Lp1B3OVH&>aH{pn-DDY`OOo09fo1b*4ol7 zM!NJv)kbAb0i>`niBPJ!iUSN@YhXoY8gijx_H^jG+ky#mib5O)3Frq8K4({@j$R$a z;3UIH*`!Z@ZHJv^d!Oc~epB05y_Ky!Ec!DaaD-^D2mt1!=Tz4}byJsB$@~DxjXCtd C%|qD$ literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 b/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 deleted file mode 100644 index f28004818..000000000 --- a/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9Ed3I@DǘN&XhL)<=Ƿx[[l/Dd&.)ZXggNlE,6)1yj-K`kJX ڢ3^Ӭ/}ЀSN`Qg=U]7: \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e b/test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e deleted file mode 100644 index a1c1892c93ae55868d5472d5f303addd1b1a285a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93IZ_rQt;$6*6fA~ri!G{=hr9nIt;_)t=6S^ zOmu07nNP+n5j3+hsgjhr=l~dlmB@z7)XkZ)+vTu#^D&f?1_VKbo;w}XC`wSuIHQ0u z5yZYjC!hA(4nI!*K2A^jO5Inx<*hzEhBF^Haqw3J0C&=Js@b2qE6Zx+euXnRb7UPy AP5=M^ diff --git a/test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 b/test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 deleted file mode 100644 index d725a9a7eb52dd60159265153a2d328d4a2555f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcX03c@fDKw;N8MfQSB{w6aZB6QVbG?NJyT3bp4k8h9Q_Tw#{Z0kCA z>)2iTp=v1>@}Wvsk(kh49RQe9&#A6|=BCYynja|*IWo1w BMg{-? diff --git a/test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 b/test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 new file mode 100644 index 000000000..69c3bb790 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 @@ -0,0 +1,3 @@ +xK +0@]$3D<Ƙ`iK7px+kkSt*ĘE-s匹$^(d6u(ENR +[ ԡw;~m^ncl3ZkaN""#2_<{ \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b b/test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b new file mode 100644 index 000000000..7938b29c6 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b @@ -0,0 +1,3 @@ +xM +0F]$?"BW=t2D'kkKGwU(6'KHuk MHЙw}u`3*ptfT +i0Np~mOn);gg5=NuS7uy3_ :n \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d b/test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d new file mode 100644 index 000000000..78eaa8524 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d @@ -0,0 +1,3 @@ +xM +0@a9dEz&`l<=Ƿxemс +EXgr*r,Մ1+fw}uma7;kO#WTp6fq{Vuh{Y4Kw{oggZ|8u~j0_AcY`Xk~6ICq5K~i-uqrg%?8Y)#Z zu>>O3_*w-l1*D-;#S@P}q*^v-fu(>nRH|gM2qQ$UebWT69FT^}l}=89%5_z+faQQR zRIY6D7N}frS{qmnNJHhyC$lg?%$y*-4=e|yp>h?IL!fe#KHmk)0cogQ<>nma7;kO#WTp6fq{Vuh{Y4KQo@ZLk4=Hmj0_AcY?|6C6ICq5K~k=BKY^uyG*n7; zVhKdbQ|&KU3P?kx)FvK*Nck+u21@~HsFeC-5k`nyK;TZW9FT^}X-rOm%7uLA1Iqzv zsGR2HEl|10FLhu!APtq%n#{rkF*BZD04xWjp>o=jL!ffWER(@zaxro#tM&oqz%*3OVzUgZ7_&&g374l!bXpEAQftngCjQwo I_vLX10F@DA0{{R3 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD index d6504a61b..84a8cf021 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD @@ -1,33 +1,33 @@ -0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 commit (initial): first commit -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 checkout: moving from master to feature/cherry-picking -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI 1617585236 +1000 commit: first commit freshman year -bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI 1617585236 +1000 commit: second commit subway eat fresh -39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI 1617585236 +1000 commit: third commit fresh -e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI 1617585236 +1000 commit: fourth commit cool -61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI 1617585236 +1000 commit: fifth commit nice -06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI 1617585236 +1000 commit: sixth commit haha -2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI 1617585236 +1000 commit: seventh commit yeah -97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 commit: eighth commit woo -05a37c1f6dc7942f15f80d45254d38735918f670 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 checkout: moving from feature/cherry-picking to develop -05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI 1617585236 +1000 commit: first commit on develop -b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 checkout: moving from develop to master -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI 1617585236 +1000 commit: first commit on master -ab79b4d60771766afa792d180d79f39d60739285 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI 1617585236 +1000 checkout: moving from master to develop -b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI 1617585236 +1000 commit: second commit on develop -54b6871251edf1636a77993925843c6294daa768 ab79b4d60771766afa792d180d79f39d60739285 CI 1617585236 +1000 checkout: moving from develop to master -ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI 1617585236 +1000 commit: second commit on master -ea69b78c08d9698cadc90164ddd19aca6ae05d5f 54b6871251edf1636a77993925843c6294daa768 CI 1617585236 +1000 checkout: moving from master to develop -54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI 1617585236 +1000 commit: third commit on develop -aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI 1617585236 +1000 checkout: moving from develop to master -ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI 1617585236 +1000 commit: third commit on master -8ceeb6cc4581b42aa9deaf9710223615ee17bef2 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI 1617585236 +1000 checkout: moving from master to develop -aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI 1617585236 +1000 commit: fourth commit on develop -8f9f24614460289546a49cb6f12a72b764af14f5 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI 1617585236 +1000 checkout: moving from develop to master -8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 commit: fourth commit on master -9c09cc9177a699a0a920d8c2a84cd2de68295382 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 checkout: moving from master to base_branch -9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 commit: file -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 checkout: moving from base_branch to other_branch -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 checkout: moving from other_branch to base_branch -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI 1617585236 +1000 commit: file changed -010057d2acf80e41ed5e6a8e49cb2c8329ae843b 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 checkout: moving from base_branch to other_branch -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI 1617585237 +1000 commit: asd +0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit +31f2a971f823279ba1ef877be7599da288f6e24b 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from master to feature/cherry-picking +31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year +3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh +d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh +dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool +687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice +17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha +c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah +5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo +c50f7e1375a30118c2886d4b31318579f3419231 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 checkout: moving from feature/cherry-picking to develop +c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop +18c07ac9568c564ececb199f78f64babc92214cb 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from develop to master +31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master +442a53c1b023b4816085fdc4eaa85d0c5fd897e2 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 checkout: moving from master to develop +18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop +7bc178be031c4645110e9accb4accf16902d2d7f 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 checkout: moving from develop to master +442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master +ced01df5f1a270490c1b9d4efe5ceb0c53626279 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 checkout: moving from master to develop +7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop +6dfbfa4bd19cb38608681df40ebb3a78bd13a824 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 checkout: moving from develop to master +ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master +c9b473bec307b18fd94a913658f4d759be63ca47 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 checkout: moving from master to develop +6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop +82db6d0e4502f489719ea0f3dbe7e14413c6d28a c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 checkout: moving from develop to master +c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master +279f068805e089660f7ddd17ff32f66100e0dca5 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 checkout: moving from master to base_branch +279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file +08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch +08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from other_branch to base_branch +08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed +4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch +08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch index b52cadf2c..79e7c0fa4 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 branch: Created from HEAD -9c09cc9177a699a0a920d8c2a84cd2de68295382 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 commit: file -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 010057d2acf80e41ed5e6a8e49cb2c8329ae843b CI 1617585236 +1000 commit: file changed +0000000000000000000000000000000000000000 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 branch: Created from HEAD +279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file +08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop index 38023c845..6a9c5917a 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 branch: Created from HEAD -05a37c1f6dc7942f15f80d45254d38735918f670 b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 CI 1617585236 +1000 commit: first commit on develop -b3be4ef2bb9bc0b38e4f57c4853878b66299bdb4 54b6871251edf1636a77993925843c6294daa768 CI 1617585236 +1000 commit: second commit on develop -54b6871251edf1636a77993925843c6294daa768 aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 CI 1617585236 +1000 commit: third commit on develop -aeadfe82e7a5b499b5f4e5f5ebdc8673abf4c681 8f9f24614460289546a49cb6f12a72b764af14f5 CI 1617585236 +1000 commit: fourth commit on develop +0000000000000000000000000000000000000000 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 branch: Created from HEAD +c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop +18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop +7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop +6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking index a08be0a14..81521b06f 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -1,9 +1,9 @@ -0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 branch: Created from HEAD -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 bc074264114488d21413b64eb72fdfaac5a79427 CI 1617585236 +1000 commit: first commit freshman year -bc074264114488d21413b64eb72fdfaac5a79427 39b895b8f8b050030fe6aaf6404c660f22b939e7 CI 1617585236 +1000 commit: second commit subway eat fresh -39b895b8f8b050030fe6aaf6404c660f22b939e7 e3a8db29b20f1aa519419cf02d0ce0a313a26270 CI 1617585236 +1000 commit: third commit fresh -e3a8db29b20f1aa519419cf02d0ce0a313a26270 61f5538c896ea41a0303368b24ab8e5dd6b0fba3 CI 1617585236 +1000 commit: fourth commit cool -61f5538c896ea41a0303368b24ab8e5dd6b0fba3 06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 CI 1617585236 +1000 commit: fifth commit nice -06fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 2f15f547118f3c3d9c81175825923e13ec6f0aa0 CI 1617585236 +1000 commit: sixth commit haha -2f15f547118f3c3d9c81175825923e13ec6f0aa0 97769241761ba59cd64059d15b548e65e8d3e65f CI 1617585236 +1000 commit: seventh commit yeah -97769241761ba59cd64059d15b548e65e8d3e65f 05a37c1f6dc7942f15f80d45254d38735918f670 CI 1617585236 +1000 commit: eighth commit woo +0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 branch: Created from HEAD +31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year +3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh +d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh +dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool +687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice +17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha +c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah +5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master index 5cbf5c2a1..20c99ff0a 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 bb921216baab8956cd3e4bdacd80eaefae7eb8e6 CI 1617585236 +1000 commit (initial): first commit -bb921216baab8956cd3e4bdacd80eaefae7eb8e6 ab79b4d60771766afa792d180d79f39d60739285 CI 1617585236 +1000 commit: first commit on master -ab79b4d60771766afa792d180d79f39d60739285 ea69b78c08d9698cadc90164ddd19aca6ae05d5f CI 1617585236 +1000 commit: second commit on master -ea69b78c08d9698cadc90164ddd19aca6ae05d5f 8ceeb6cc4581b42aa9deaf9710223615ee17bef2 CI 1617585236 +1000 commit: third commit on master -8ceeb6cc4581b42aa9deaf9710223615ee17bef2 9c09cc9177a699a0a920d8c2a84cd2de68295382 CI 1617585236 +1000 commit: fourth commit on master +0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit +31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master +442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master +ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master +c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch index 83227bd5e..f188d6a1c 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 CI 1617585236 +1000 branch: Created from HEAD -9f4efa2b7bc217363a1b3bc4a9a9fc419118f907 c622516f02266679505b89103007ec04b8748b67 CI 1617585237 +1000 commit: asd +0000000000000000000000000000000000000000 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 branch: Created from HEAD +08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b b/test/integration/mergeConflictUndo/expected/.git_keep/objects/01/0057d2acf80e41ed5e6a8e49cb2c8329ae843b deleted file mode 100644 index 0428f961570b83eabcf9720ed4fb6fc2ba70f6a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmV;K0A~Mq0gcX03c@fDKw;N8#q0&iBxxoA5uvLdV=|rCg8iXH@c8x!ZXe&`$+j$W z1I+o-4ppcaqEMxhC=ew<9<9{OS~PSjE;tez)tQ|ST^r;Yw6ZHy#3A|U8H+CxICHKN zFe9d#EgAl_X*-}F;NA~U{qnNE^(Nc$0E|do>YR^oMQg1&>p9i*Pj2e`R*;F;myYHK Hi~Bt4TrdX#jNS]ԕos5|< \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 deleted file mode 100644 index 8cbbd91b8..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/06/fe8615a7ea8f1eea8955bd8039c9c6bcd7ed23 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]dI)]dB C-xmY@4zeG̝-Z$Frڀm b=x+HH19/)j(%yi;`>OȲmbpphNzN5S7um_|> \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 new file mode 100644 index 0000000000000000000000000000000000000000..4fd3d95f4c568b9122d51e5a638682282500148f GIT binary patch literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V0?l(cOho3OVH&#$9P3HX&H(^Xn6O9cEziUhCSd zV|Qt%s`Wr2lL#aN<)FfWb(F=Yg{j22FhUYUbEH$>&3fblkqCkUag0z!hf_^vwu z1<5Ix^l7jCw9{i0cyw`_y(P2b44q&f60MluoYWk;c%DSof0Ur}N4s8!c AYXATM literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 new file mode 100644 index 0000000000000000000000000000000000000000..a042d47f25a978460a99b28fdd441063d0b1b758 GIT binary patch literal 153 zcmV;K0A~Mq0gaAH3d1lA0DJZ;bT1TnlN~6fkW-%F$Px)O3&DjxzkzRw`G|d zI1HC|h=3#u+6Sy zUz9zwkEXoav>nh7aPNnwe9E%FNW!)Q!&CCiqpb&Mf8& H!T&z+&6r3a literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb b/test/integration/mergeConflictUndo/expected/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb new file mode 100644 index 0000000000000000000000000000000000000000..a58cdfd1c390d5973fb705281d1084dfcd9e5d96 GIT binary patch literal 159 zcmV;Q0AT-k0gaDK3c@fDKwak)*$Xn$nS2T&LRURTn@q6KG^IxI_y)Xy+s9kH7fQ}c z)g8jA9wNG9n;d&5;KdR_2(ttRL*f9DO*E7&M^^iE$X0bQkenbnGf@+K=)AX)XF@`6 zT%U-s?+DfOs*iH$Vbs@Qyvt|G`zn`E@=c>fXB{$uJ|h6AMq5;sKXsLs` \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b b/test/integration/mergeConflictUndo/expected/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b new file mode 100644 index 0000000000000000000000000000000000000000..60cc78ba96e63bfb60c1f80faa9a4fd544212296 GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlw|zZZ{2x2tD-~+jJKThDc1o=UeatUWXYbm7KQ* zIN+&ORZwE)MY>2M^ExDCi(&f$4z0+IDeo+-5=*x4luJ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 new file mode 100644 index 0000000000000000000000000000000000000000..7fafc3d92c64b6e4942abbc24ad93ebcded0baec GIT binary patch literal 161 zcmV;S0ABxi0gaALYC|y$2D|ntv@aA(cKrjT6tc=OWWP@&Q0E25h2-`P^a9-uGcbK0 zUdS&mud(!9B!asFq=XqQ7SCLKJ PPD3yBfKK-dupmQ8?uAU3 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 new file mode 100644 index 000000000..cc8df6e44 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 @@ -0,0 +1,2 @@ +xK +@ @])dU N[</quj-&IDeyJc1!57 bkj! zdo?Z8Us}ysCpdvk$<7mi4&uqcL~mVZ9460TgaA@IYJNAJ4Sbp;OhPjQJ%^4%oJkVJ zOfYO9RvalDZ7Ed`qrMO0Gk>t{Yre&@Jv3W(z3;_XePtq2Cp}NK{HLzwa@4lyUv^Ge J)fdPSKI_nLL1_R0 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 new file mode 100644 index 0000000000000000000000000000000000000000..3816d711134c927fa34b2bf1e43620c228bc14bb GIT binary patch literal 155 zcmV;M0A&Ao0gaAJ3d0~2MLTvC&I{%F$Z^Jfvdf*ePpBUKJ6Elb)w~`coIV9<8tPmz`5L J@dfdm literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 new file mode 100644 index 000000000..f43fa73ed --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 @@ -0,0 +1,3 @@ +xM +0F]dI3DzLh1%DoxXKY; D.'L8k``FZE&"5jƚ9&u8!qV՗`6or܁,e2Lz +e8@N \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f new file mode 100644 index 0000000000000000000000000000000000000000..055a213aca47f1fac1ccc9793665242d93581b65 GIT binary patch literal 158 zcmV;P0Ac@l0gaA93c@fD06pgwdlzIkNs|;rgr540WOs{#ZAy*e^DX!Rufq%s*Ll7- zutbNpslp_VSaVb?L6bP=ZNj3?OGzRrut;`@(X4sXr2!?zn7Qvl;x2e)(@nIYt_` BMEw8& literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2 deleted file mode 100644 index 445a71f0c..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8c/eeb6cc4581b42aa9deaf9710223615ee17bef2 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]dg"BW=ƘLi4%F_,9o  VE`Оx0sHkoЅdhaC^UyH)@S I) dﶖ - iˇK,ioFD~ɟjV*(;d~X}1? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5 deleted file mode 100644 index 59111e4e2..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8f/9f24614460289546a49cb6f12a72b764af14f5 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0)P11J)? ԈWf`bYW%|;@1>F|ƅ{֍Mjk% f-wM<+9TvFYXqzێ4:9Ur9:/Rs31B \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/97/769241761ba59cd64059d15b548e65e8d3e65f deleted file mode 100644 index 68717092a1057866074a19a5fa0555a5ecfc0c20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmV;N0Av4n0gcX03c@fDhGEw^MfQTsB%S<#h|pD!F-;~^u(s4FdV3>Y!0pHPz?+tN zzEo|%?dm3?GdL*T80V1^6OGVG#KPH(ffECcoO6s;t-Q&t!Gct%^N69?WOGab(Ni!K zjTN+#TmfcK{HW8i>3-11emKjE=k+Rww9F@s?kmVxr}qc|s;w=m%Aa?2muG94^v~(H K@T5MA>pri0(^CKd diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 deleted file mode 100644 index 8bd499914..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9c/09cc9177a699a0a920d8c2a84cd2de68295382 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]$6?c2PRSۏxR SE`ُP$O.d,rFI#f -9vy5,hMI(O1C+>J6r)=m3jU_&*co+4/(fA \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9f/4efa2b7bc217363a1b3bc4a9a9fc419118f907 deleted file mode 100644 index 07c4733e66e067c634a1c18ce4d04f011a3d9e9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcWv3d1lAK+(=Vh4(^{mDrY`ltQK)L$MSZh?@{x=<%B)bp5>Hm#x;N z`M}}Q4l|EHv5+bVfpIkD$kywGGBM35O`JhAXSd5?@8-Dxm%<@uNz4Mm2ucNo`l6_o z2sw6yPCo6m9ex=7eHfqimAbEXD_ec|kV1|Wu}l6M0KlE~oND$bck{BE`vEesIVLOj BNpt`J diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 deleted file mode 100644 index 84d67dadd..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/79b4d60771766afa792d180d79f39d60739285 +++ /dev/null @@ -1,5 +0,0 @@ -xM -0a93 "tcL )io xR-e%zc [!ZOtـaqBcM -:SWQ+|$Oqęx zGm0/p;OZn\px8+)8\~ - -/@ \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 deleted file mode 100644 index 781dfa0c9..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ae/adfe82e7a5b499b5f4e5f5ebdc8673abf4c681 +++ /dev/null @@ -1,3 +0,0 @@ -xK -@ @])$_LuJ+x,p73$*Yx"SD S -C)nRY)"A|b(K~m8uYv(m9e4$2 ݗ~~m~T{ٽ? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/b3/be4ef2bb9bc0b38e4f57c4853878b66299bdb4 deleted file mode 100644 index ae401c39345cabb4d8128004194ed2556e9f4d34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0gaA93c@fD06pgwdlzIk*-avd2tD-~HQ8XHZAy*e^DX!Rufq&Xs`ETH zu!M)Use)x+0>_{j)jNkN-8C_a(||-QSzPg)*{s8+O9Pa_g+#^Y6wYi5Nr{+QtZ;TQ zI5|@+KA;(1?NK-Adbo7`O+UlDPI^jpz5;m)62&?XM?yri(|xMxpSmgI_H6L0pe~U0 Mty5ji7toJB@WJv*3IG5A diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bb/921216baab8956cd3e4bdacd80eaefae7eb8e6 deleted file mode 100644 index 2480055e3940f46f3e9bdacf8730fd996a523a52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0ga783WG2Z0DI0W_FgDiP1XcTDR}Z3Yuu$mLnKY1&#&MIybd!=DmkwW z(Bq|55fDd2Gk4JiqQxg9jjS>!P8!tlq9TLqqv3CRl?vko_i=j4kMs7HTPpbhNI3Z5 byPn{R)>^aEebVHlZgj1m21jN7cJVL0UpG10 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 deleted file mode 100644 index 6425bd3e4..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/bc/074264114488d21413b64eb72fdfaac5a79427 +++ /dev/null @@ -1,3 +0,0 @@ -xK -1]$aVs -ƑAoUPz]*?P|W(\síwQ%Mc0HfɂQ{HB4Ѽa^Nxq_ӵEC֚/NuriNJ\Fop3D \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee new file mode 100644 index 0000000000000000000000000000000000000000..adc43e7e2a75059341eb03f14b6aec89320ffce5 GIT binary patch literal 154 zcmV;L0A>Gp0gaA93c@fD06pgwdlw{|Cc6Gp0gaA93c@fD06pgwdlzIk*=!7m2tD-~NxHQKYf6de^DX!Rufq&Xsmn4q zu*iqDsX{nA5gC+I$=TWzbu1P=#UK(!Pfm!=#j{z{rq2d`C{~f8IM% zEwDTFy%g(-LjVvVCDagVM65avK4s;sH3O!Y*_%!F^6HjrC{?_YCJ%%I3Mgs{!ooEL zV1Ti*BO{-FUw1n%cAA%4`AXZK<&xHRwJ-q1F?u9>2IrhP>M_;JpWMhhn;#weIU+uy BLze&m diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 new file mode 100644 index 0000000000000000000000000000000000000000..e7b2a49ea47eedce9ad686a0b95fc2c064eed708 GIT binary patch literal 156 zcmV;N0Av4n0gaAJ3c@fH0A1%4Z!gGu`3FRVu6m3#d7%YkN{ry~EqDR9!wgJnwQd6> zhSTWGAj$byoIw?ox7K)14J#wv9=D=4A*JC^C#B*!I#wP4akzSjkѦ>x׵sN(풋1,NBZ(;\K/R ShC8"ֶSU͡R~26_z1@ \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 new file mode 100644 index 0000000000000000000000000000000000000000..035d7ebefa5f4760d14464c4aee16160a6970cfd GIT binary patch literal 166 zcmV;X09pTd0gaA9YQr!P0DIOe_Ff3P(poD)DTSQ;jJ32PfjTy}LYv>mkPqZK%)pdo zp06D|$w%MJfP^)b%*>^!AjagYFb=uqrg^eKID7WRt-9H*L#X5_1mRLsoDx&Rz!K9S zRB;-bFG)}-I=%PHvcY+Tuk-k0|2nU~b}GyK4HQYD5C?=$LPU4aW2)Pmy4$TRw+gQe U_WSgw4>0Y}Hrp@m366z9cnq6VZvX%Q literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 new file mode 100644 index 000000000..aa4879a75 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 @@ -0,0 +1,3 @@ +xA +0E]df$DzdfBkK-xw{e]{Fh xTI9yQTL,0j7>kT@GRJ*@ +#ifƅK6 .tOZd]@bwGBDT?u{UUPf>? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 deleted file mode 100644 index 6fc26c12d..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/a8db29b20f1aa519419cf02d0ce0a313a26270 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]d$#Lh#x| ^=xA;&%$ lu֙8 i,&Ū=5yv01r!C4XRd2Vs4QJ>o tOZ\x[o0]pDT=>/5/? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f deleted file mode 100644 index b9fd215e0..000000000 --- a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/69b78c08d9698cadc90164ddd19aca6ae05d5f +++ /dev/null @@ -1,2 +0,0 @@ -xM -0]d3 ]yOQ0Mi#x|#^/R Cr1d5G$! ]081U4> ;A$7I;Lg뿁ƍJ^^7npn>)rMGT՞c]0 ;>;? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch index 1be09a6b2..60c28ebd6 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch @@ -1 +1 @@ -010057d2acf80e41ed5e6a8e49cb2c8329ae843b +4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop index 3aaf94808..b4d7d5850 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -8f9f24614460289546a49cb6f12a72b764af14f5 +82db6d0e4502f489719ea0f3dbe7e14413c6d28a diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking index f91b953a9..02e8ef0f4 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking @@ -1 +1 @@ -05a37c1f6dc7942f15f80d45254d38735918f670 +c50f7e1375a30118c2886d4b31318579f3419231 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master index 0b95f1f06..d4f5ac796 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -9c09cc9177a699a0a920d8c2a84cd2de68295382 +279f068805e089660f7ddd17ff32f66100e0dca5 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch index 582e1c389..d324b15b4 100644 --- a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch @@ -1 +1 @@ -c622516f02266679505b89103007ec04b8748b67 +8cd762c119834784fdbf97e9bb3b4c15e804ebaa diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD index 21c1550a1..c7c35a1e7 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -1dd0692a163379d160e23ac52509d909b41b0a35 +562af0640203fb5a6e92c090d8d1ded26806d2c4 diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/.git_keep/index index f2656bed9e5b7d640868610a214f73e0aaff6f63..4e5ae2746971402ecd0b12b47f0fa5e2853611ee 100644 GIT binary patch delta 488 zcmXxdze~eV5Ww-5v_koXjHZUHpzzE{Ztx_ g%C?9$cG;E6%sA&yowwkpYu_DR%;p9w)xPKPKT@TNe*gdg delta 488 zcmXxf%_~G<6vy#r?mRI~x-)V$k=1k~l1x@pY#0j*FUgXUEGC&9#m34%a68j%rW8#x z78W#;tx}ZkZb~5wc^?*-1q+jN&;40EeHWk3IXyWuXWFT;=@F%r!7n<$ls3cpgMt4B zl+q2|nFq&C#yr~kZWrQ$9-S4Rw(AukF6hZQ^{Mc2BE$tflNIo-bT=->g}u-sZ127# z#)ZAoA#9)GVq932wBhe8@0wy<*c;8jjxPKkaAEIM5R1iE`-gc>3ae91tSvOSKFTJA z{ZcCE-3v#~&wAOUFqg8y1Y1Yf#KJL~6!t?mVo|-3*kO~xYGi9~uDQ{TT(U`FU$iXN m(&<))*rc#ewx05>whgQ4x|pnnS~Ep!a&2?A?`mo;pZ){0my`Jb diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD index 587c36a83..6ebcd55da 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/HEAD @@ -1,34 +1,34 @@ -0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 commit (initial): first commit -c5507059e2aa65bc2dad65bd38b879079b69c48c c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 checkout: moving from master to feature/cherry-picking -c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI 1617586185 +1000 commit: first commit freshman year -54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI 1617586185 +1000 commit: second commit subway eat fresh -5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI 1617586185 +1000 commit: third commit fresh -a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI 1617586185 +1000 commit: fourth commit cool -174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI 1617586185 +1000 commit: fifth commit nice -eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI 1617586185 +1000 commit: sixth commit haha -00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI 1617586185 +1000 commit: seventh commit yeah -fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 commit: eighth commit woo -f05cdc6bb7f98285583770bec5a8d307a7805bd6 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 checkout: moving from feature/cherry-picking to develop -f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586185 +1000 commit: first commit on develop -417a3f75c440e565dab9b5afa78747ef37446348 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 checkout: moving from develop to master -c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 commit: first commit on master -a2a2ee2fe3ad96c470a921fe71c1216d93188c9b 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586186 +1000 checkout: moving from master to develop -417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 commit: second commit on develop -4e71d4ff127ae9e3d482239e16dc1d78e56feec0 a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 checkout: moving from develop to master -a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 commit: second commit on master -a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 checkout: moving from master to develop -4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 commit: third commit on develop -fe1f8f70f67822120b40d9d704011aec6e17c3a7 a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 checkout: moving from develop to master -a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 commit: third commit on master -f2a15f45b921460e675a8849db39de008b2c03cb fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 checkout: moving from master to develop -fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI 1617586186 +1000 commit: fourth commit on develop -91e16cacdb23b0b5515c6109ea301b0cb6367010 f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 checkout: moving from develop to master -f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 commit: fourth commit on master -1b3e191104f74b8e4054e22e9ab3b9dcfe299743 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 checkout: moving from master to base_branch -1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 commit: file -8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from base_branch to other_branch -8e13f545446048648331cbe93de64b1cf22df166 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from other_branch to base_branch -8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI 1617586186 +1000 commit: file changed -0539c9baf43fb1939d8f56695ceb08a86e8e1fae 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 checkout: moving from base_branch to other_branch -8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI 1617586188 +1000 commit: asd -1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch +0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 commit (initial): first commit +1618ce1085acb41fd710e279ac38911aadfb0a09 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 checkout: moving from master to feature/cherry-picking +1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI 1617671441 +1000 commit: first commit freshman year +b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI 1617671441 +1000 commit: second commit subway eat fresh +f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI 1617671441 +1000 commit: third commit fresh +edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI 1617671441 +1000 commit: fourth commit cool +cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI 1617671441 +1000 commit: fifth commit nice +b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI 1617671441 +1000 commit: sixth commit haha +df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI 1617671441 +1000 commit: seventh commit yeah +1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 commit: eighth commit woo +d3e2708327280097b5e1f8ab69309934b24f8b64 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 checkout: moving from feature/cherry-picking to develop +d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 commit: first commit on develop +a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 checkout: moving from develop to master +1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 commit: first commit on master +f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 checkout: moving from master to develop +a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 commit: second commit on develop +55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 checkout: moving from develop to master +f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 commit: second commit on master +a19ec0b99e516795f349033f09383f87be0b74e9 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 checkout: moving from master to develop +55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 commit: third commit on develop +dd259e90c3748e269bdf1ee3ce537a006d2394aa a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 checkout: moving from develop to master +a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 commit: third commit on master +61db24350a92fa37b2fe35f13eb3dd3f7655f6cf dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 checkout: moving from master to develop +dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI 1617671441 +1000 commit: fourth commit on develop +e563585cb87cc39b553ca421902d631ea8890118 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 checkout: moving from develop to master +61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 commit: fourth commit on master +559043765dc6c32c943b6278b4abbff1e6f52839 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 checkout: moving from master to base_branch +559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 commit: file +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from base_branch to other_branch +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from other_branch to base_branch +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI 1617671441 +1000 commit: file changed +341cf8213827614a274c750cd7dec4307eb41de7 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 checkout: moving from base_branch to other_branch +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI 1617671444 +1000 commit: asd +562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI 1617671461 +1000 commit (merge): Merge branch 'develop' 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 index d924ca3c2..6e46aa010 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 branch: Created from HEAD -1b3e191104f74b8e4054e22e9ab3b9dcfe299743 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 commit: file -8e13f545446048648331cbe93de64b1cf22df166 0539c9baf43fb1939d8f56695ceb08a86e8e1fae CI 1617586186 +1000 commit: file changed +0000000000000000000000000000000000000000 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 branch: Created from HEAD +559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 commit: file +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI 1617671441 +1000 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 index bb6a166b8..83fe584c1 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 branch: Created from HEAD -f05cdc6bb7f98285583770bec5a8d307a7805bd6 417a3f75c440e565dab9b5afa78747ef37446348 CI 1617586185 +1000 commit: first commit on develop -417a3f75c440e565dab9b5afa78747ef37446348 4e71d4ff127ae9e3d482239e16dc1d78e56feec0 CI 1617586186 +1000 commit: second commit on develop -4e71d4ff127ae9e3d482239e16dc1d78e56feec0 fe1f8f70f67822120b40d9d704011aec6e17c3a7 CI 1617586186 +1000 commit: third commit on develop -fe1f8f70f67822120b40d9d704011aec6e17c3a7 91e16cacdb23b0b5515c6109ea301b0cb6367010 CI 1617586186 +1000 commit: fourth commit on develop +0000000000000000000000000000000000000000 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 branch: Created from HEAD +d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI 1617671441 +1000 commit: first commit on develop +a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI 1617671441 +1000 commit: second commit on develop +55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI 1617671441 +1000 commit: third commit on develop +dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI 1617671441 +1000 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 index fe42f6cc0..f90ef71fb 100644 --- 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 @@ -1,9 +1,9 @@ -0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 branch: Created from HEAD -c5507059e2aa65bc2dad65bd38b879079b69c48c 54757435deaedf649b36b12188bc8a5e3ea6a833 CI 1617586185 +1000 commit: first commit freshman year -54757435deaedf649b36b12188bc8a5e3ea6a833 5e3a33cb09434849f7bbabaaad8386c9f0508eec CI 1617586185 +1000 commit: second commit subway eat fresh -5e3a33cb09434849f7bbabaaad8386c9f0508eec a42af37388a9ad2eac85f71828cfc63262c90900 CI 1617586185 +1000 commit: third commit fresh -a42af37388a9ad2eac85f71828cfc63262c90900 174226770a9dfeb661c9818c920568703c27c480 CI 1617586185 +1000 commit: fourth commit cool -174226770a9dfeb661c9818c920568703c27c480 eeb8990921f62a1ec3fc0be960c8068a24503ca8 CI 1617586185 +1000 commit: fifth commit nice -eeb8990921f62a1ec3fc0be960c8068a24503ca8 00dc25bdd47993a880597e0680039d04a4d3328d CI 1617586185 +1000 commit: sixth commit haha -00dc25bdd47993a880597e0680039d04a4d3328d fbd2d93aec237d4e44e44f3647067972c3fa69f5 CI 1617586185 +1000 commit: seventh commit yeah -fbd2d93aec237d4e44e44f3647067972c3fa69f5 f05cdc6bb7f98285583770bec5a8d307a7805bd6 CI 1617586185 +1000 commit: eighth commit woo +0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 branch: Created from HEAD +1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI 1617671441 +1000 commit: first commit freshman year +b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI 1617671441 +1000 commit: second commit subway eat fresh +f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI 1617671441 +1000 commit: third commit fresh +edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI 1617671441 +1000 commit: fourth commit cool +cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI 1617671441 +1000 commit: fifth commit nice +b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI 1617671441 +1000 commit: sixth commit haha +df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI 1617671441 +1000 commit: seventh commit yeah +1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI 1617671441 +1000 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 index fb187ba0e..3ac4fad17 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 c5507059e2aa65bc2dad65bd38b879079b69c48c CI 1617586185 +1000 commit (initial): first commit -c5507059e2aa65bc2dad65bd38b879079b69c48c a2a2ee2fe3ad96c470a921fe71c1216d93188c9b CI 1617586186 +1000 commit: first commit on master -a2a2ee2fe3ad96c470a921fe71c1216d93188c9b a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d CI 1617586186 +1000 commit: second commit on master -a69f126bd3e0b9dc222cd35c8d9d7dba3d62cf2d f2a15f45b921460e675a8849db39de008b2c03cb CI 1617586186 +1000 commit: third commit on master -f2a15f45b921460e675a8849db39de008b2c03cb 1b3e191104f74b8e4054e22e9ab3b9dcfe299743 CI 1617586186 +1000 commit: fourth commit on master +0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI 1617671441 +1000 commit (initial): first commit +1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI 1617671441 +1000 commit: first commit on master +f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI 1617671441 +1000 commit: second commit on master +a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI 1617671441 +1000 commit: third commit on master +61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI 1617671441 +1000 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 index 294c5fa02..cb2cf3437 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 8e13f545446048648331cbe93de64b1cf22df166 CI 1617586186 +1000 branch: Created from HEAD -8e13f545446048648331cbe93de64b1cf22df166 1dd0692a163379d160e23ac52509d909b41b0a35 CI 1617586188 +1000 commit: asd -1dd0692a163379d160e23ac52509d909b41b0a35 32129537d40d9fb35cf3dd6fba7985870142324b CI 1617586205 +1000 commit (merge): Merge branch 'develop' into other_branch +0000000000000000000000000000000000000000 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI 1617671441 +1000 branch: Created from HEAD +0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI 1617671444 +1000 commit: asd +562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d b/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d deleted file mode 100644 index fc38886e8..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/00/dc25bdd47993a880597e0680039d04a4d3328d +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]d&DzI:F-xh`ѝڦ -\p1.RÓDbˤ]lV@5qco++3c`c|ڼl0pƻRק^Ro@?Lh8Oܼ{g,/= \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae b/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae deleted file mode 100644 index d42d27687..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/05/39c9baf43fb1939d8f56695ceb08a86e8e1fae +++ /dev/null @@ -1,3 +0,0 @@ -xM - @=BqtJ)dc86`o[<ޖeRCD7@BC n)KmPŪ=v\`$I -anD*z}oCA 1F'Wm~)/! << \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 b/test/integration/mergeConflicts/expected/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1 new file mode 100644 index 0000000000000000000000000000000000000000..5c37019a9b178ebec270dc06df9315f29e832605 GIT binary patch literal 148 zcmV;F0Biqv0gcW}3c@fDfMM4;MfQTs})0zVsuVT Cc}DsG literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 b/test/integration/mergeConflicts/expected/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09 new file mode 100644 index 0000000000000000000000000000000000000000..d75634d716952dcce29ea9b05a3dd91493d17bc4 GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlw|D+f4%^LQj3hHr>U7Atk2J=UeatUWXYbm7JFb z*x{*FRZwE)Nv@H4=DADA7R7W*lB_q9*;E7FqLZz?N`+yB`!GIrm%P69l1hF6G6oJv bgm6ahy*ubJY5J$`Y^k3Hzsh|9bi*&P(sMZn literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 b/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 deleted file mode 100644 index 15d9caba9..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/17/4226770a9dfeb661c9818c920568703c27c480 +++ /dev/null @@ -1,3 +0,0 @@ -xK - E;v O'R(˸C -1W::p9N:W\zKG8+ dݤVh9&> LvVV/ gjLcOP˃K+!+Ozm m> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 b/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 deleted file mode 100644 index dd70f37c5..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/1b/3e191104f74b8e4054e22e9ab3b9dcfe299743 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]dMDzI21%-x/RSo"08i$u9zC1ӄD,)M^d6- ;} -OqA`^:/wpٞrป, A.U{+4/(>l&A/ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 b/test/integration/mergeConflicts/expected/.git_keep/objects/1d/d0692a163379d160e23ac52509d909b41b0a35 deleted file mode 100644 index 5e5e92605a7241daab75a906035a9125a925eb4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcX03c@fDKw;N8MfQSZGLuOHMTD+;jQmVcFt*eP9^W3p?c-a#viANM z8lpLkT|`?Si2zda*<&VZ4zcCHw$vPJZWXY&8m-#WF0Y}305(UChz$j%fCwc^#41b~ zO0%{$U{>if?(44SMNji`lW*$VQ!ZugR}Bo_1%?px8H_RNsK?ZhKe6 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 b/test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 new file mode 100644 index 000000000..99413297c --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89 @@ -0,0 +1,4 @@ +xM +0F]d&͏cPR xŰ*,g>Ӟ +MGΌX; +RlFav(91tRCN9~i`4} (?UϹy諵L7Z3C!Ql;o8pgqSMH zu?bq(Gp3p_<%u$C;6I(}0I8S%O3)box1#*5Q1C=kw*&zIEO2 z_Eg&X0wff97LN>%goy4)j}ycG$=#dv4};uwD+`>eec8S3C%A2+K^u$p_utO_018`D Ea!$@?9{>OV diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7 b/test/integration/mergeConflicts/expected/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7 new file mode 100644 index 0000000000000000000000000000000000000000..564b332bae0413e32f842d19d3aa843a1140d022 GIT binary patch literal 153 zcmV;K0A~Mq0gcW<3d0}}K+&!}h5JI8QR66-QphUD&~a=6H3`8&kKY`j+s|8k-dbC_ z#uzXC5YZK#XR4F~IikRr3UG}{vbaImI73WDjM~#7YuAvC4U}y4Bn$&oUz|XwmZDhB z8B&aBE2{MA^LFTQ()V$C$~U$BEjQlUL!(FXgwCP9A^@nfo>N`^?Dp z=qw)ErV5=8g}tz%XmAcw8Z~(&r;OHm%H&G$*_$IhT0}HE-KU!Vshcuw&j!B=>I1UA Mb*`)V0#H>y=P=Yta{vGU diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/71d4ff127ae9e3d482239e16dc1d78e56feec0 deleted file mode 100644 index f637207ddfdbd657f0367790855841eaa79bdf6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0gaA93c@fD06pgwdlw{WHrWUwLQj3hCc8zUZAy*e^DX!Rufq&Xsq_43 z&^dQ#n<|XrT~Q{rIcgH`u}e0qN6ASf#UjGqS~4qdx->vX>_-X((Q1f6IG=Oiktq?9 zj-C*s$7J}`?sbEHfJ;Bz^uzNy>8aHD3NAVdDY_Kl=&ZG7r~6dXKXvoeQWt?=26X|^ Mw@!66Us10?DAOcKU;qFB diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 b/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 deleted file mode 100644 index ebdcf28a2..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/54/757435deaedf649b36b12188bc8a5e3ea6a833 +++ /dev/null @@ -1,3 +0,0 @@ -xA -  EM4 -1' & z0b,MݝZ3`RC@9Aȋ*MjP69$JǦG?5ڼV9N:Nwl\x-7w[yJ)q#O]GJBOU̙C \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 b/test/integration/mergeConflicts/expected/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 new file mode 100644 index 000000000..acf9f3125 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839 @@ -0,0 +1,3 @@ +xM +0F]$ "tcL*Sb +߂pKG7f06ea 4HQ8瘲ڨki2! &g#;'>u^=jq|@kΨV=:9WRWiP_P} mA \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 b/test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 new file mode 100644 index 000000000..cd691a15d --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503 @@ -0,0 +1,6 @@ +xA +0E]d&S +"BW=F&3EmJ x>/eyTDLR4`2wG1Tz>dĈmiB"C"10Er䅣 0eoI6) +(#8"F[T?i +? +jo^B \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4 new file mode 100644 index 0000000000000000000000000000000000000000..785d58c4c0eda2661823a530b5c32db68adb2b61 GIT binary patch literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MfQTsWTu%0L`1Sf-WAVjU^5g6I+i_qt0TXmFET){eg@vOk4(sF&USXRw1Mu z$g*K_6pRtHx3R9!^>FR_JHKgKo_xu5x`A@a+u&5Na8^=EanNI`@t?ZbIM=zrFN1AQ RFZuvegJI=u6kj7aLXU3dN?ZT{ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf b/test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf new file mode 100644 index 000000000..744a40a57 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf @@ -0,0 +1,2 @@ +xM +0a9i&?"BW=FNhR#x| ^7. :SUS 轋(0zǒ8ZT̖v}6H$:bQG>+-xp[bȊ9I6;\ᮟT^Ƶހ<Lh8ܴy')XP > \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 b/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 deleted file mode 100644 index 1ed4cdd2a..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/8e/13f545446048648331cbe93de64b1cf22df166 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0] '#/Xhl)<9a&ﭭ]*V~RS9B1آetLs=8ӄ+2՛`h iJ\rff_)Eoldž[C* N'ĠcO]u:U9P \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 deleted file mode 100644 index 979a5d3db..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/91/e16cacdb23b0b5515c6109ea301b0cb6367010 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F]d&DzLИR_<;hSo" ɐ \ʆC8G1ImɫC.3fNiLD+qޗ`6r܁,Yr΄XS]U{ 2/Hn fAc \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 new file mode 100644 index 000000000..5a18068af --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9 @@ -0,0 +1,2 @@ +xM +0]di"BW=$`F>ދgv@h,و 9k f${BqrSR6ΣC$6yMIfO:8ۣ0/p|l/Zn@lG3!괟jg]A]mPA# \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b new file mode 100644 index 000000000..f93dc352f --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b @@ -0,0 +1,4 @@ +xK +0@]d&| +"BW=FL6F{R]&<]49x L)JbF<Ǚ66F` +0F:Qs ѱ_Qw]>rIu93Qjʴ?*+dy\7> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b b/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b deleted file mode 100644 index 1db4d9945..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/a2/a2ee2fe3ad96c470a921fe71c1216d93188c9b +++ /dev/null @@ -1,4 +0,0 @@ -xK -1D] AD'cLo *(TKٺ4 -O1K-;@MV=9@2F&0يLޫQܷlZ;Uhs$pQi 1~Ga:Nwp^zo~mZh;UϺ9T:OB ?@] \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 b/test/integration/mergeConflicts/expected/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8 new file mode 100644 index 0000000000000000000000000000000000000000..1ab3c4866cfba89ba2a219c763e51b83d9497b03 GIT binary patch literal 153 zcmV;K0A~Mq0gaAH3d1lA0DJZ;bT1T1apV|EDdd!A*osU7%|dXY&u^d~=yjNZ(QR4g z3XJ|z4>M@Q&`M)1s~ATUA3M}Qqm`Vpp!ku;)T!IkVQU3dirFkSOl=lrOqn>A%!(*M zc=XB0$KcYtPTK+f0QY`)+9xgh%Wk?Y4SHS)LofNo#0o&I;*)a Hj%Gf0Gpo87m9jCi|xNc85l~!+nghNb( bDZ&xG_im^A#NDpfgzsh|9cxf-ihHN+C diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 b/test/integration/mergeConflicts/expected/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497 new file mode 100644 index 0000000000000000000000000000000000000000..58dd790dc247af1c1d343136e1e67939b063343e GIT binary patch literal 155 zcmV;M0A&Ao0gaAL3c@fDMqTF=*$Xn0PX0hd=&HwVwC7@TFSH zt7`-H(wm6R>I;lOK5XI;LfQZT literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 b/test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 new file mode 100644 index 000000000..139da07d2 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64 @@ -0,0 +1,3 @@ +xM +0F]$I"BW=F2NmR"z| ^{[Kݡo"%̥LlbdԚ7yv +">Y p9&_}n #*\ׇ a!Qku?O\r ? ޭ/Ճ=w \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa b/test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa new file mode 100644 index 000000000..f66748219 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa @@ -0,0 +1,3 @@ +xK +0@]d&i@DcL -XSJ>ރWں.,敖BX'aRgb=˾:LS1Bà1{,PkjCf.$5Zks@gxx[ P$L ͗~>/ +&}m@; \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 b/test/integration/mergeConflicts/expected/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6 new file mode 100644 index 0000000000000000000000000000000000000000..0e14fe82843a6674b83d186846fde209271ff365 GIT binary patch literal 154 zcmV;L0A>Gp0gaA93d0}}0DJZodoL7Mjc%coLQZ+csw)O+6H*I#egpkLufq&XT3VYs z80}7d6M=*|qw_9!c5Fi_B@B_sqv3#L2!+YUfz-;IygEc31{-taD@Jl+i_=~V=9og3 z$Rt-PSQ07z^tx;?PH-EihwR+er(Dv~?tmVH59l1i8MW5xpvP2~KXvt<_g>*wLFLNo I3vKK^qnb)bod5s; literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 b/test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 new file mode 100644 index 000000000..0c4f12bc5 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118 @@ -0,0 +1,2 @@ +xM + F/G?PJ!C )Ĕ^_:(Ko1&OfeeGp0gaA93d0}}0DJZodoPsLsB55Gp0gaAJ3c@fDKwak)vlnD0O(qG52wn9U>109+_Ctx_@hx}(w~zPW$+j$W z1B>p`4prz_QER8(3ad@ZE=80;MeCSHMs~%P9L4PU(6s>tXDx?-IhCp-Gf9dRC0XC@&IBAJ~BlQS3*Q{(sQcmpSr1YZ4>+|SZ7i5 I1qVGniOFb1-T(jq diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 b/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 deleted file mode 100644 index 66eeb34ae..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/f0/5cdc6bb7f98285583770bec5a8d307a7805bd6 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F]$I"BW=FLlR"z|+^@VK֥7fp^Qf4)\ 'k7~t(SV9Ii &$T%R(Vga;ΧYO-QJ)v.x}_Q= \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb b/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb deleted file mode 100644 index 53e60ec34..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/f2/a15f45b921460e675a8849db39de008b2c03cb +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$N& "̄-5Ƿ>ރWCTD\`C89;0<ԎYH -I$#A_>-pݯ>Tv. ZkvOuS7}7_|A@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e b/test/integration/mergeConflicts/expected/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e new file mode 100644 index 0000000000000000000000000000000000000000..c75a873adc644ce2b65b95f17b71b2a2608591d4 GIT binary patch literal 163 zcmV;U09^lg0gaA93c@fD06pgwdlw`dH%S8`LQj3hcC)2|HKk2ae{aDLcpYY7q)gMj zg2Q;Iiz;9wZX^+r3>>Wujmwd&PdN>odi9Z#BPV9&MV}RVm;D(X+rUYD(8QS?3N?&w z@KLnMnS|KzR>!hH+rg#nZu;hFe&|WcbOj6;LqsBkBU)?CPWP#*f9hscDbEbQ4A!lG R@duPE42!O#`2t>ZLh=@LN<#nu literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 b/test/integration/mergeConflicts/expected/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3 new file mode 100644 index 0000000000000000000000000000000000000000..1190b1af399c192cc0388d4a90d588bdb7026913 GIT binary patch literal 158 zcmV;P0Ac@l0gaA93c@fDMP26TTbx~W2&th$!N=sIC)5+-iN1rFX>WzW{x7@B0wDw{49sG|^-Ftid!M``ke+IW^| z0~3i%X+%Lb@~V%rK|jE?AMW~=ygv03OTK+SeCNqIf-@naIp`5p_0PFU^R`#`Sx^?p MvLCYf0O}w=Oy)~VqyPW_ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 b/test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 new file mode 100644 index 000000000..572556d0f --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1 @@ -0,0 +1 @@ +xϻj1ӹ4 +yl]-B1~,i5u`FW}&e#.YRuӌb%#PjJb:1./)2E*4(L{,˻>Һ Hȋ'+τӱ'OڿrO[YTຍm,?>R \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 b/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 deleted file mode 100644 index 73675419e..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/fb/d2d93aec237d4e44e44f3647067972c3fa69f5 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]dO@DǘdF*X[j/k0DcBԾd}!6%Q%ԅsjM _]RB`H63:rlI٦ea0MzC]蠣OA'{>O]=_&u~> \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 b/test/integration/mergeConflicts/expected/.git_keep/objects/fe/1f8f70f67822120b40d9d704011aec6e17c3a7 deleted file mode 100644 index d1205a6da05b14c18b2b5a4cc26c29f11d5068c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0gaAJ3d0~20K4`SZ(k_ysqq7)6tc=Oj6O*q#vr!z_zm;|-3~J_v6ixS zkc5}sn86P|*+7_rr4X~XGg*Z=YYb}ES)oV8=%YA7F7oQrNA^) u>es{^u#} 1617586445 +1000 commit (initial): myfile1 -5c021eb54f0eac90e22f363ee9214454a55b81de aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586445 +1000 commit: myfile2 -aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586445 +1000 commit: myfile2 update -29f276b162bc253add87f21f45013cbce86c4ab0 5b64b56ce78c5611173e73ee34cf0eb6fddac926 CI 1617586445 +1000 commit: myfile3 -5b64b56ce78c5611173e73ee34cf0eb6fddac926 aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586451 +1000 rebase -i (start): checkout aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c -aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586451 +1000 rebase -i: fast-forward -29f276b162bc253add87f21f45013cbce86c4ab0 cc25737e7c56a583e7f22d97c66f304e90689206 CI 1617586451 +1000 commit (amend): myfile2 update -cc25737e7c56a583e7f22d97c66f304e90689206 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (pick): myfile3 -ef37d114b15acc27c17e75fa36ccfa1e50e913a8 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (finish): returning to refs/heads/master -ef37d114b15acc27c17e75fa36ccfa1e50e913a8 a3f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 CI 1617586454 +1000 commit: test +0000000000000000000000000000000000000000 01ed22faef05591076721466e07fb10962642887 CI 1617671463 +1000 commit (initial): myfile1 +01ed22faef05591076721466e07fb10962642887 922fc2ed1965fe8436ce7837c634379f14faf3c3 CI 1617671463 +1000 commit: myfile2 +922fc2ed1965fe8436ce7837c634379f14faf3c3 7a40dadc0814bf7f1418d005eae184848a9f1c94 CI 1617671463 +1000 commit: myfile2 update +7a40dadc0814bf7f1418d005eae184848a9f1c94 2479abfe7bd6b64a753d3c3797f614bbb422f627 CI 1617671463 +1000 commit: myfile3 +2479abfe7bd6b64a753d3c3797f614bbb422f627 922fc2ed1965fe8436ce7837c634379f14faf3c3 CI 1617671469 +1000 rebase -i (start): checkout 922fc2ed1965fe8436ce7837c634379f14faf3c3 +922fc2ed1965fe8436ce7837c634379f14faf3c3 7a40dadc0814bf7f1418d005eae184848a9f1c94 CI 1617671469 +1000 rebase -i: fast-forward +7a40dadc0814bf7f1418d005eae184848a9f1c94 244cec6fa9704d5dc61fc5e60faba4125dfe3baa CI 1617671469 +1000 commit (amend): myfile2 update +244cec6fa9704d5dc61fc5e60faba4125dfe3baa c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 CI 1617671469 +1000 rebase -i (pick): myfile3 +c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 CI 1617671469 +1000 rebase -i (finish): returning to refs/heads/master +c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 92571130f37c70766612048271f1d4dca63ef0b5 CI 1617671472 +1000 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 index 0f186d9f1..80ec4b0e9 100644 --- a/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuilding/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 5c021eb54f0eac90e22f363ee9214454a55b81de CI 1617586445 +1000 commit (initial): myfile1 -5c021eb54f0eac90e22f363ee9214454a55b81de aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c CI 1617586445 +1000 commit: myfile2 -aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c 29f276b162bc253add87f21f45013cbce86c4ab0 CI 1617586445 +1000 commit: myfile2 update -29f276b162bc253add87f21f45013cbce86c4ab0 5b64b56ce78c5611173e73ee34cf0eb6fddac926 CI 1617586445 +1000 commit: myfile3 -5b64b56ce78c5611173e73ee34cf0eb6fddac926 ef37d114b15acc27c17e75fa36ccfa1e50e913a8 CI 1617586451 +1000 rebase -i (finish): refs/heads/master onto aa2e4ffc88c4f55487a7b5e8090f68efab2fa26c -ef37d114b15acc27c17e75fa36ccfa1e50e913a8 a3f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 CI 1617586454 +1000 commit: test +0000000000000000000000000000000000000000 01ed22faef05591076721466e07fb10962642887 CI 1617671463 +1000 commit (initial): myfile1 +01ed22faef05591076721466e07fb10962642887 922fc2ed1965fe8436ce7837c634379f14faf3c3 CI 1617671463 +1000 commit: myfile2 +922fc2ed1965fe8436ce7837c634379f14faf3c3 7a40dadc0814bf7f1418d005eae184848a9f1c94 CI 1617671463 +1000 commit: myfile2 update +7a40dadc0814bf7f1418d005eae184848a9f1c94 2479abfe7bd6b64a753d3c3797f614bbb422f627 CI 1617671463 +1000 commit: myfile3 +2479abfe7bd6b64a753d3c3797f614bbb422f627 c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 CI 1617671469 +1000 rebase -i (finish): refs/heads/master onto 922fc2ed1965fe8436ce7837c634379f14faf3c3 +c69e35e8cae5688bbfcf8278c20ab43c1b8dbae3 92571130f37c70766612048271f1d4dca63ef0b5 CI 1617671472 +1000 commit: test diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 b/test/integration/patchBuilding/expected/.git_keep/objects/01/ed22faef05591076721466e07fb10962642887 new file mode 100644 index 0000000000000000000000000000000000000000..8bc75322327a02410eda3111dbc6764e37f80b72 GIT binary patch literal 119 zcmV--0Eqv10ga783c@fD06pgwdlzK4T{jU#gr540G}&OGOG=5Lzc)|tIt(+Znyn3p z<U9B7DCJTE+E;S$qzaPi$<^?+%H`!qlG6K&u0lBzv`guM8k Z9N|oe=sN9_rhn?rzGdB%+z&C@EXzQDImQ40 literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa b/test/integration/patchBuilding/expected/.git_keep/objects/24/4cec6fa9704d5dc61fc5e60faba4125dfe3baa new file mode 100644 index 0000000000000000000000000000000000000000..3cc9bff71d6ceaf0ee4d868e826c1a705df237c2 GIT binary patch literal 156 zcmV;N0Av4n0fmk+3d1lA06Y5?-V4RD94UrU3Yqc@p~y5)Hz7FC{=ONyce&xX;dH5W zZaxM$wav^2=%~*K82KP*#*R#|Oh~aWj4H{5GrLtbdo`b9EE;WsOkJ@)A*peXtb_?U z7f3}4DmvNQW7+&L`s*;>?JaeE+C`Uo^FYAFkO=)5LJ01#$5gXFdH&_De#-o`==XJ! KX6_5S**oZw2uwEs literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 b/test/integration/patchBuilding/expected/.git_keep/objects/24/79abfe7bd6b64a753d3c3797f614bbb422f627 new file mode 100644 index 0000000000000000000000000000000000000000..5a46f9e626d2b432f3fc55a00128e4f229262ff9 GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fDMP26<*$Xn$Ofw0H2wn9UV=}=)V@rvkw>L+Szk9p~KW()x z&0?feJ5;T>p+t~eSQQGAr~^=nDVM+;M_?wO1~$7K`f8SiAWKdVkRFA5fguBoDvE*n zBo<7OjJ(@(JM1*u>oni>BXwW(lD2xY=#f1md1ucE0H)J^s_CD)so%1!>dX)8R60t= C1VXF; literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 b/test/integration/patchBuilding/expected/.git_keep/objects/29/f276b162bc253add87f21f45013cbce86c4ab0 deleted file mode 100644 index e2b671e92c88a856837b312082b3032f680cd40b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0gcX03WG2ZK;f=)itGzzjFTUsl!7adF`3Lz!Bmk5?d|Ikx_x|$$7`)~ zvktmT+eIu3I8+V;YQcc4*=OuI#|Ta#m)N5(DLJ#zF7IZEoS-VF#Hik5iWIY#1OsSD zqLiJI3vB3UuXVTMWbfnjln>QyksGh|VY|>pp8}${*A4*8SZMB@}DK2QZE* zaf;+i1y$bTvF>`B^>v!>{3(5V@`cuZ(M=F=PpNO$Vf 0{8"rgߺJ3, \ No newline at end of file diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 b/test/integration/patchBuilding/expected/.git_keep/objects/7a/40dadc0814bf7f1418d005eae184848a9f1c94 new file mode 100644 index 0000000000000000000000000000000000000000..e5abc6ca1b3c977a8a96fa321005bd95e8c058db GIT binary patch literal 155 zcmV;M0A&Ao0gcX03c@fDKw;N8MfQRunQ4ANMChu=NG3B_XlyAd=1F zB(W%2fI#J=zt&xklfIABlRvp_3*TsM4{f~-K3Mdiuhtl&&U#LD{*$Zrm3d*OkFDm; J>IaZmJoivsOi=&; literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 b/test/integration/patchBuilding/expected/.git_keep/objects/92/2fc2ed1965fe8436ce7837c634379f14faf3c3 new file mode 100644 index 0000000000000000000000000000000000000000..cc91b81d519c9a721590bd545497f2b15bba80d3 GIT binary patch literal 149 zcmV;G0BZku0gaA93d0}}MZ5MC?h9pRqN746g{*Q6jUx@jCIk!Z?duV`{qH^a%UNJ@->jvmU4UA)i=}O>WCx?;06<)~i8Z5dc(Q`>7^>>Z*Rrx(TTtT|7A> DT`xi8 literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 b/test/integration/patchBuilding/expected/.git_keep/objects/92/571130f37c70766612048271f1d4dca63ef0b5 new file mode 100644 index 0000000000000000000000000000000000000000..e19be1d70814302c64009895425514eed427b5ba GIT binary patch literal 146 zcmV;D0B!$x0gaA93c@fD06pgwxeKzJq}c?D2tD-~o9zY#V@r+T^X(J74#P0Aw)W^2 zGoJdcYT3J*ftO0EP%*H201a7|nuziML?MbJv+=I4ZY5^*gC=1eVoIe{smW0i2V8;| zENLl6#PFxz*WFID9jE!GUvAq|FS53)#fTIM137y}05AtVrn>&Ao38I}ey3PENG>@; A)c^nh literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 b/test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 deleted file mode 100644 index 61ba3fdc1..000000000 --- a/test/integration/patchBuilding/expected/.git_keep/objects/a3/f4e1d22fc10b73baa1cb1f66db6699cd92c2c7 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0a9E4?ӀU1N`m<=ۇw2ϏmB:UrT"bSEJ"WA&x㤶@RՐͪ2pݗ?_'Nϙ%9LDn}5w9 \ No newline at end of file diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c b/test/integration/patchBuilding/expected/.git_keep/objects/aa/2e4ffc88c4f55487a7b5e8090f68efab2fa26c deleted file mode 100644 index 537c0c7a98e3a9c3036b190f964c8fa119814fbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93d0}}0DJZo-V0^bU87J+A*VcJ)s+Tn6M}{I_w@Y6fGBZ;traE>6>R_C2av<8uo ziBd2{6u%83M!)<@cC2#GfjW-hoKXQFG0H6jPQ(gYdRr}WUDOUXe*6TVw DVP#5A diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 b/test/integration/patchBuilding/expected/.git_keep/objects/c6/9e35e8cae5688bbfcf8278c20ab43c1b8dbae3 new file mode 100644 index 0000000000000000000000000000000000000000..9a0ede51c49fb3d77b8a29bec8b12998080b9587 GIT binary patch literal 153 zcmV;K0A~Mq0fo*@3c@fDKw;N8MfQTsWb)I1h|pD!F-ay^XlyAF^!9e)-tFUCyu7wH zca71W`Yxh{2*Ck)%90?VDY1YxLSYE84AGRq2Vqbf@AB;0SeqsL$}xZ~u4IojJMmCC zu|?xb6-vyCU;VM}dYtriobK}Gwk>kWYrARm7<@qMNuLn_)KQPAE`NCZan(L`UWC*a H?72F~GRscz literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 b/test/integration/patchBuilding/expected/.git_keep/objects/cc/25737e7c56a583e7f22d97c66f304e90689206 deleted file mode 100644 index 0740abfde9f5d93c027a4457f7f6abec381baa22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0ez0K3c@fDK%Mgy*#*fZx#S8WLZ^PlHNC@vv8AM-e{Tn8mp44#@XAu_ z+^lzSYMY34fQh;Q!RLcex`0VI=oFGC&7p7<&RsSuZ}MuE*-KO{L?tR>q|A9lA=f!g zB+8>#_Nf@&+hf^mKiF$O+~v)6eafXQ^=2VKMoKZFJ%e-39QK%M@;^uT<)(ggeu}sI MI&l;81u|GX&;Bt^I{*Lx diff --git a/test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 b/test/integration/patchBuilding/expected/.git_keep/objects/ef/37d114b15acc27c17e75fa36ccfa1e50e913a8 deleted file mode 100644 index e66271bda52ada9cbe20342e8bc717ef923a611a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmV;J0B8Sr0ey}^3d0}}0DJZo-V0@QbyuO3LQZ*x(G3m6CIk!Z@9UxGUWXZ&yw$oi zZK6B1LqrRr0S`!+WrE4r5(_vh$bn-C(Uw3g3Dlkrc{ZK1^^7c>JtZGdc(%RaOf(}n zi9kI9Qt8zm+o6Y1Ux)E7?^O3yE_tgrZOE_>4z%3@J delta 119 zcmbQqG?Pii#WTp6fq{Vuh?x_zvSL_kzx;>Mj0_AcY?=!*CaM^UXJzGz=yi$!rNA^) v>ej>@kW>sue~COu7l?*R&7Zg>P^9E#-~5moTmK&qG$%(d(ri8JP_+;M81yFD diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD index ee1e9a05a..507fc33cd 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 CI 1617586780 +1000 commit (initial): myfile1 -a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 5677dceabb2de40c648da3c831d037b429375131 CI 1617586780 +1000 commit: myfile2 -5677dceabb2de40c648da3c831d037b429375131 0a1e762c8cd2587e05d56acb7294937adb3b90b4 CI 1617586780 +1000 commit: myfile2 update -0a1e762c8cd2587e05d56acb7294937adb3b90b4 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586780 +1000 commit: myfile3 -28d8e975606801b4ba31b292312d4030109e4f1a 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586788 +1000 reset: moving to HEAD -28d8e975606801b4ba31b292312d4030109e4f1a 808f2484733488c2b6bd2f3773b04437bbb20434 CI 1617586799 +1000 commit: test +0000000000000000000000000000000000000000 9a939087472cfaf305396d4b177ee888ced193d9 CI 1617671474 +1000 commit (initial): myfile1 +9a939087472cfaf305396d4b177ee888ced193d9 5063202049f1980e035c390732a7e6da8783357f CI 1617671474 +1000 commit: myfile2 +5063202049f1980e035c390732a7e6da8783357f d0ec73019f9c5e426c9b37fa58757855367580a5 CI 1617671474 +1000 commit: myfile2 update +d0ec73019f9c5e426c9b37fa58757855367580a5 ad27dd25048bff07da92d2d9d829e4dd75472da4 CI 1617671474 +1000 commit: myfile3 +ad27dd25048bff07da92d2d9d829e4dd75472da4 ad27dd25048bff07da92d2d9d829e4dd75472da4 CI 1617671483 +1000 reset: moving to HEAD +ad27dd25048bff07da92d2d9d829e4dd75472da4 e474bc2d1712ed5fdf14fb7223392f1b0dcc8d37 CI 1617671494 +1000 commit: test diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master index 2b2404ea1..4789bfb1e 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 CI 1617586780 +1000 commit (initial): myfile1 -a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 5677dceabb2de40c648da3c831d037b429375131 CI 1617586780 +1000 commit: myfile2 -5677dceabb2de40c648da3c831d037b429375131 0a1e762c8cd2587e05d56acb7294937adb3b90b4 CI 1617586780 +1000 commit: myfile2 update -0a1e762c8cd2587e05d56acb7294937adb3b90b4 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586780 +1000 commit: myfile3 -28d8e975606801b4ba31b292312d4030109e4f1a 808f2484733488c2b6bd2f3773b04437bbb20434 CI 1617586799 +1000 commit: test +0000000000000000000000000000000000000000 9a939087472cfaf305396d4b177ee888ced193d9 CI 1617671474 +1000 commit (initial): myfile1 +9a939087472cfaf305396d4b177ee888ced193d9 5063202049f1980e035c390732a7e6da8783357f CI 1617671474 +1000 commit: myfile2 +5063202049f1980e035c390732a7e6da8783357f d0ec73019f9c5e426c9b37fa58757855367580a5 CI 1617671474 +1000 commit: myfile2 update +d0ec73019f9c5e426c9b37fa58757855367580a5 ad27dd25048bff07da92d2d9d829e4dd75472da4 CI 1617671474 +1000 commit: myfile3 +ad27dd25048bff07da92d2d9d829e4dd75472da4 e474bc2d1712ed5fdf14fb7223392f1b0dcc8d37 CI 1617671494 +1000 commit: test diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash index e9334f7fa..26825b7bb 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash @@ -1 +1 @@ -0000000000000000000000000000000000000000 06855901b0dbd8859a7ef5437380cef241f60187 CI 1617586788 +1000 On master: asd +0000000000000000000000000000000000000000 2c60d208ba3ec966b77ca756237843af7584cf93 CI 1617671483 +1000 On master: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 b/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 deleted file mode 100644 index 29fc008b6ce6c3ed02e1715d46125e7a465b945b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmV;n07?IN0gcZwY6LM1h2hk53ik^^^2oLvLRi>ptDHfWWD_T3dy?**lq+U1h2<{0-)6|hUQ5c58L&~46<`JQ801poj5 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 b/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 deleted file mode 100644 index 95d201062846ae47467d9c3baf7a88c04ed8e471..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmV;M0A&Ao0gcW<3d0}}K+&!}h5JGob#x4rQphUD&~c=J*o0u9y?t|pZa;7Fd2Ma( z+Jd?CT|~2h#mZs8S}-8j>@zyfL|`lALJob2(W))&^6uIPqQa7LwnY#)U@XaTbf$o# zjCOG3jWa48{k86Tob-L1p7Kd;Tja)TduS63`4}jIz8U~fXFaF7{K-}O)_D=DkFBIG J>IaeCJmS6+Piz1H diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 b/test/integration/patchBuilding2/expected/.git_keep/objects/1a/b6a62ed874b19c1191ba2b0106741ca4ca4b50 new file mode 100644 index 0000000000000000000000000000000000000000..0f416d438e537639efa30d0910644c9b1819fa55 GIT binary patch literal 164 zcmV;V09*ff0gaA93c@fD06pgwdlw{0H%%fULQj3hHoL(>)0P^c{@z}^dmUzA(o)J; z!J2rgn+R}&IU&WQQ|leMG#JAHgE-2PF@vP$l>*3b*580`#lU&kL?qFKuTW>Hla5h?NbiWBa^2y^QjrszqheM&u98Z1# literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a b/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a deleted file mode 100644 index 0101e824ab085f4349ad630a5797f982a9eaaa39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gcX03c@fDKw;N8MfQSBekTJWLRUS;B$;5r*is_s?d=iVKEA~(Ywyd@ zhWu&lBAT6T1Y8@6Kr^1j0f?tkTSBA&h&~pJYU5pALjxPZXiF;9hJ*s4hR7wOB~K2y zW|s-FSNtB2b=T9ZuhV>&5BKdUm$LSoHql^65fkXM0RVN>V`|8sT=j2Tp5oLG>9jgq D!DvP< diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 b/test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 new file mode 100644 index 000000000..824ef6445 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/2c/60d208ba3ec966b77ca756237843af7584cf93 @@ -0,0 +1,2 @@ +xϻjA  Akn!+Wy!׬ǐ6_+KUԔDmDVxTJh]6M ,DzlRVBu6ˑs0?OҒV27JTIhH2 +kyu/׳ȸ(L\p D\O|`co J \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f b/test/integration/patchBuilding2/expected/.git_keep/objects/50/63202049f1980e035c390732a7e6da8783357f new file mode 100644 index 0000000000000000000000000000000000000000..088ac6af9c977827160539ea8484e52b8ca73213 GIT binary patch literal 150 zcmV;H0BQet0gaAL3c@fDMqTF=*$a}tW@bP{=&HwAX zK|}Gdt*Vf%E6GVrm_qBtr=BRYWA#$BxWthH=7eUERi{1V%o)wLRt)?j2n2-A&(8mr+k?u2-Nyt>@4(!;uit>~x>n^iSOkQ`R@k6I6Nb S)%kY?^;3pXt@#4gZ9)JlCRI)V diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 b/test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 new file mode 100644 index 000000000..229d31f3d --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/9a/939087472cfaf305396d4b177ee888ced193d9 @@ -0,0 +1,3 @@ +x +0 a}IfL*;16BeTзw?7fh+&j0E)DUys)_6'>_r;+Ñ1ute5 +?2~, \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 b/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 deleted file mode 100644 index 0ad5f47f2..000000000 --- a/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Ѯsʌ'))1P!")#tyS5[˥*`?4df 9PxKL}⧽qzm[ @B•ѝ4;eUr?4=, \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 b/test/integration/patchBuilding2/expected/.git_keep/objects/ad/27dd25048bff07da92d2d9d829e4dd75472da4 new file mode 100644 index 0000000000000000000000000000000000000000..d7ecb6bbe2d42f061b8ee0419e00001a4c17da21 GIT binary patch literal 149 zcmV;G0BZku0gcW<3c@fDKvCB@MfQSBnoK4GB0^U^#+Xj9(3nyp=bX&yQ&pG6b6|KsX}o<)B|YXJeNeo2t*;~fy^emzPg=3GkI`aIHQIkW`1}of{Bn4 zqK||L1dY7=v+Z`A>~);(`jNV=ddaQctc#8!xj@059RQf49#dWa5KwJ#mv`3=yhT8up_(CpfOXjpz!oEm zFEMbi)^Szw=&yCxQ^ICIflyynCv=vLY6*+A5@s_!u7ah{P?cI6jkUo5I} z7ul;sC+~J!Hs}X9_rujbQrCx_rlnqh5^-XRCBl&q(d~4fYWAn@n!TF)0{E;sC*<5l A=>Px# literal 0 HcmV?d00001 diff --git a/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master b/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master index ca13e5a27..c7758f16b 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master +++ b/test/integration/patchBuilding2/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -808f2484733488c2b6bd2f3773b04437bbb20434 +e474bc2d1712ed5fdf14fb7223392f1b0dcc8d37 diff --git a/test/integration/patchBuilding2/expected/.git_keep/refs/stash b/test/integration/patchBuilding2/expected/.git_keep/refs/stash index 298dc200f..7ced0bdf5 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/refs/stash +++ b/test/integration/patchBuilding2/expected/.git_keep/refs/stash @@ -1 +1 @@ -06855901b0dbd8859a7ef5437380cef241f60187 +2c60d208ba3ec966b77ca756237843af7584cf93 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/index b/test/integration/patchBuildingWithFiletree/expected/.git_keep/index index a009f0e4c6fd1f2804c18a3e1658638caf678e4f..8df96033352f649b2e725f646283166aade14d18 100644 GIT binary patch delta 92 zcmbQvJe^s^#WTp6fq{Vuh?x_zx4MfsANvWT85tN@*mOm!C#p;o2T9pIRs>4{X{c1i e#53DP8dpu8_5a>-R!&uUyLvscM|l%?ALh 1617587025 +1000 commit (initial): first commit -3260dd534b59a53e44813fc97bb49742fb971cdf 4d0cf75a1ca408441015baf53e8c745f4157771c CI 1617587025 +1000 commit: blah -4d0cf75a1ca408441015baf53e8c745f4157771c 6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3 CI 1617587034 +1000 commit: asd +0000000000000000000000000000000000000000 c17dc7400fbb649385064c27544ba1e6c4751566 CI 1617671495 +1000 commit (initial): first commit +c17dc7400fbb649385064c27544ba1e6c4751566 b5e8fb99b011265d28065d0d545ff6b0245b1fa1 CI 1617671495 +1000 commit: blah +b5e8fb99b011265d28065d0d545ff6b0245b1fa1 88981dbb0664057b766113679127284f69f4fb69 CI 1617671504 +1000 commit: asd diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master index 94291433b..233b507f8 100644 --- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/logs/refs/heads/master @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 3260dd534b59a53e44813fc97bb49742fb971cdf CI 1617587025 +1000 commit (initial): first commit -3260dd534b59a53e44813fc97bb49742fb971cdf 4d0cf75a1ca408441015baf53e8c745f4157771c CI 1617587025 +1000 commit: blah -4d0cf75a1ca408441015baf53e8c745f4157771c 6f46e5d5c077bed74def0f0b5d15549e5a2ebfb3 CI 1617587034 +1000 commit: asd +0000000000000000000000000000000000000000 c17dc7400fbb649385064c27544ba1e6c4751566 CI 1617671495 +1000 commit (initial): first commit +c17dc7400fbb649385064c27544ba1e6c4751566 b5e8fb99b011265d28065d0d545ff6b0245b1fa1 CI 1617671495 +1000 commit: blah +b5e8fb99b011265d28065d0d545ff6b0245b1fa1 88981dbb0664057b766113679127284f69f4fb69 CI 1617671504 +1000 commit: asd diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/32/60dd534b59a53e44813fc97bb49742fb971cdf deleted file mode 100644 index ce5350a7870a7d8f997465cbeb43b033d799c7df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlzIAvgrmygr540Y`VdMA(BS$`4;?u*I|aqt=4UT zC3_lO6}+&cH3#pq1eKUDppuuuYlx1yh^mk1O?r<<>o6~HotL|QQhh!3l3Trj4R#`) b&=H(1BASC9lc9g=rfhv5@T<%h8>%kteeOC= diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c deleted file mode 100644 index 42fdd552d..000000000 --- a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/4d/0cf75a1ca408441015baf53e8c745f4157771c +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=Bqt1fF%؄`ǯG_^]CK?KsȄ"28[d$5C1:˻kgyD \1ESUѧEYԎdo ^_^oK9[ \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/6f/46e5d5c077bed74def0f0b5d15549e5a2ebfb3 deleted file mode 100644 index 96f18c2bad2579bb94f5d2407fe80eef75c74965..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0gcW<3c@fDKvCB@MfQTs*i0q?5uvLdV>+3jU~H)oJia}G+s|8kU0Qo| zj~NbqGxNEMC}bwcneqTag~(KEMk%o-I9t*fXSd2`ukJ$utxSR{0a6GENV8NLcE*8f zKw@T8C!c;_Ha|}OGEO)9N?V_H(xqKJMr2A1L-0og0JqnDs@tF3$-B58=Y2Srcg;T= diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/88/981dbb0664057b766113679127284f69f4fb69 new file mode 100644 index 0000000000000000000000000000000000000000..da296aa57ee73026bc1df6dc3c3fbbbfb0b69d86 GIT binary patch literal 146 zcmV;D0B!$x0gaA93c@fD06pgwxeKxzyJ;3ggr540O|pxEv86`v`SuB3<}l1*%F^1S zdt^BDP1UoB6yTA7nfMGsl}Jl5Myb&f1WhHz>{i+I)qN&SmYFjkhDbFe*a?*eGK(3) zKp9QY$*13!%}=wxO!G~@($=S*%F?bLBaU%Ig25jV0Nif(sjh$KPTtl10QcrNza)A| AlK=n! literal 0 HcmV?d00001 diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 new file mode 100644 index 000000000..f8deebc64 --- /dev/null +++ b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/b5/e8fb99b011265d28065d0d545ff6b0245b1fa1 @@ -0,0 +1,4 @@ +xA +@ @Ѯ/D3 +R +uَ8Ƨl+3R zNU3~8 \ No newline at end of file diff --git a/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 b/test/integration/patchBuildingWithFiletree/expected/.git_keep/objects/c1/7dc7400fbb649385064c27544ba1e6c4751566 new file mode 100644 index 0000000000000000000000000000000000000000..ded22a0e19135861f3ea88083405f9938ab8e5ad GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlzIkY_;Bo6Wex_k2Tx G76$+mJ}%<` delta 146 zcmaFJ^pHu##WTp6fq{Vuh*=V{a(GmacK?Raj6g9q%^e3Osu+p`rPSZwlLtwGXsFbS zi8){?O~KiWASn 1617587212 +1000 commit (initial): myfile1 -aa6ceb765f57224d1196d23b6ba65a767765a1c5 f1b38f1bd77ac351d397a83dd0ec1325e8622c01 CI 1617587212 +1000 commit: myfile2 -f1b38f1bd77ac351d397a83dd0ec1325e8622c01 e448ece7cf84d19a78095018a271731cdcc2bb1b CI 1617587212 +1000 commit: myfile3 -e448ece7cf84d19a78095018a271731cdcc2bb1b cbb8acda2ebe17a088fc1f89251bd4d9b0397580 CI 1617587212 +1000 commit: myfile4 -cbb8acda2ebe17a088fc1f89251bd4d9b0397580 fb01ecb35c6574bf41e689abec9afa337d22819e CI 1617587224 +1000 commit: asd +0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI 1617671505 +1000 commit (initial): myfile1 +f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 +6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 +5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 +fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/.git_keep/logs/refs/heads/master b/test/integration/searching/expected/.git_keep/logs/refs/heads/master index fb97c6bad..84a0ee396 100644 --- a/test/integration/searching/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/searching/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 aa6ceb765f57224d1196d23b6ba65a767765a1c5 CI 1617587212 +1000 commit (initial): myfile1 -aa6ceb765f57224d1196d23b6ba65a767765a1c5 f1b38f1bd77ac351d397a83dd0ec1325e8622c01 CI 1617587212 +1000 commit: myfile2 -f1b38f1bd77ac351d397a83dd0ec1325e8622c01 e448ece7cf84d19a78095018a271731cdcc2bb1b CI 1617587212 +1000 commit: myfile3 -e448ece7cf84d19a78095018a271731cdcc2bb1b cbb8acda2ebe17a088fc1f89251bd4d9b0397580 CI 1617587212 +1000 commit: myfile4 -cbb8acda2ebe17a088fc1f89251bd4d9b0397580 fb01ecb35c6574bf41e689abec9afa337d22819e CI 1617587224 +1000 commit: asd +0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI 1617671505 +1000 commit (initial): myfile1 +f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 +6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 +5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 +fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 b/test/integration/searching/expected/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 new file mode 100644 index 0000000000000000000000000000000000000000..c20549cea3674120d012a7f189ddd4c4167cc4e8 GIT binary patch literal 146 zcmV;D0B!$x0gcW<3c@fDKvCB@MfQTsWHLz#B7&pPi5&BiveSZ$QbPr0l@6KPYwMuH}bCL2hp}Tv1!Fb AlK=n! literal 0 HcmV?d00001 diff --git a/test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d b/test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d new file mode 100644 index 000000000..925e7d7e9 --- /dev/null +++ b/test/integration/searching/expected/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d @@ -0,0 +1,2 @@ +xM +0F] oDzdcK7GpxkmП!mxPwwRW'Sv`9 yu3 TFe@<[bc;Cmʅv!űa>1F ;Nu3W[ק8o: \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 b/test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 new file mode 100644 index 000000000..b83e266ba --- /dev/null +++ b/test/integration/searching/expected/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 @@ -0,0 +1,2 @@ +xM +0@a9L#?3Xhl)n╵wHap6XFQ3|%JQY6[Aѫj)gR+])RD0s%I\w'C>m\`֣EDsc˟ܴ΋d=;g \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/aa/6ceb765f57224d1196d23b6ba65a767765a1c5 b/test/integration/searching/expected/.git_keep/objects/aa/6ceb765f57224d1196d23b6ba65a767765a1c5 deleted file mode 100644 index 7afa7dbe9..000000000 --- a/test/integration/searching/expected/.git_keep/objects/aa/6ceb765f57224d1196d23b6ba65a767765a1c5 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9I#M&XR"~̖r*Jd7Y)J3_pMy.0Np~m^rPbLzLɝ}*1H, \ No newline at end of file diff --git a/test/integration/searching/expected/.git_keep/objects/cb/b8acda2ebe17a088fc1f89251bd4d9b0397580 b/test/integration/searching/expected/.git_keep/objects/cb/b8acda2ebe17a088fc1f89251bd4d9b0397580 deleted file mode 100644 index 0dc3ac718bcd1fb7d800c68be5c551e296f25b2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeKzJY?3XA2tD-~$##PUV@rvkzqe2DItv6-`o^W*l;27y=+?moRyh zS;Uos#pHK?th*g2dmX2{esbHMdXcr=EFQ_g$)U4n1ORi;W2)<)x@q6KJeAB3=vz4M DJIO_t diff --git a/test/integration/searching/expected/.git_keep/objects/e4/48ece7cf84d19a78095018a271731cdcc2bb1b b/test/integration/searching/expected/.git_keep/objects/e4/48ece7cf84d19a78095018a271731cdcc2bb1b deleted file mode 100644 index edd16047d..000000000 --- a/test/integration/searching/expected/.git_keep/objects/e4/48ece7cf84d19a78095018a271731cdcc2bb1b +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E)/LƘR -<8")ox{)k0tzX@DN=d:T qZN!*&7B1+8LT?sSn': \ No newline at end of file diff --git a/test/integration/commit/expected/.git_keep/objects/47/912ceb0ffa9b205290e75103d9dd6b1878e87b b/test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 similarity index 58% rename from test/integration/commit/expected/.git_keep/objects/47/912ceb0ffa9b205290e75103d9dd6b1878e87b rename to test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 index a92c77d4a..4d1e18b15 100644 --- a/test/integration/commit/expected/.git_keep/objects/47/912ceb0ffa9b205290e75103d9dd6b1878e87b +++ b/test/integration/searching/expected/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 @@ -1,2 +1,2 @@ xA -0@Q9I#M&XR"~̖r*Jd7Y)J4$gᚲ\zWa>NO$Vf #p&DtG=&]ξuY16, \ No newline at end of file +0@Q9I#M&XR"~̖r*Jd7Y)J4$gᚲ\zWa>NO$Vf xW5zT(Ez%CS%vq%XPghGil(1=7CF`9xFNF992t7&FR5z?Zs^7A1g6aplf;sWQ Cghvhl diff --git a/test/integration/searching/expected/.git_keep/objects/fb/01ecb35c6574bf41e689abec9afa337d22819e b/test/integration/searching/expected/.git_keep/objects/fb/01ecb35c6574bf41e689abec9afa337d22819e deleted file mode 100644 index d3a32f94c2af52c462fedef443887054b1ab12b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gcX03IZ_TZ5ez~ttJ;~B97AM?EaxT~-0)W};J~i}DZuniz5BP03<9(Gy AumAu6 diff --git a/test/integration/searching/expected/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 b/test/integration/searching/expected/.git_keep/objects/fc/759ce6e48e0012eab3f02ec3524a55be938dd5 new file mode 100644 index 0000000000000000000000000000000000000000..68eb0fa54721153b06dd87a062df94f88b417d8c GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeKz}>~0be5qjz~l5~RwV@rvkzqe2DIt^$c2iOQG`QsEb3(-$0cz@v!z{M-Ez&bF!3NhLP8u!vUkogQ zDb!jZ&L+M4W8LjI+3Psn^^@B6)Js|0&Ek<1j|^ 1617587272 +1000 commit (initial): myfile1 -1fb49389c3ca6720391e91714cff34f842b56328 d431809a4ded1399fbe0203a92eca627d40c873a CI 1617587284 +1000 commit: asd +0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 +70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master index 0da23f748..307e32726 100644 --- a/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/logs/refs/heads/master @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 1fb49389c3ca6720391e91714cff34f842b56328 CI 1617587272 +1000 commit (initial): myfile1 -1fb49389c3ca6720391e91714cff34f842b56328 d431809a4ded1399fbe0203a92eca627d40c873a CI 1617587284 +1000 commit: asd +0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 +70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/1f/b49389c3ca6720391e91714cff34f842b56328 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/1f/b49389c3ca6720391e91714cff34f842b56328 deleted file mode 100644 index 3a9806586..000000000 --- a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/1f/b49389c3ca6720391e91714cff34f842b56328 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9"BW=FL&XR"~̖SU!hzE2EfeS.0p~m^r;H2Daa8"rgߺJB3, \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 new file mode 100644 index 0000000000000000000000000000000000000000..2a9fc4bd2ec726a6c10a5a068fd6779578e9a8e8 GIT binary patch literal 145 zcmV;C0B-+y0gaAJ3c@fDKwak)*$Xn$$*)jE=&HwR@PQdSlbCkSaMxk!lQMFGiq^5j4Uv-6>^W+UXa02Ss)jtdMig%K15O41mj zM53G$8~(KWcG!8b)4bgD%XNS1W!>tvH?f=O3G5jGz;xQDn*OO9erNLo3vf8ltx!j> literal 0 HcmV?d00001 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a new file mode 100644 index 000000000..bd6730a28 --- /dev/null +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a @@ -0,0 +1,2 @@ +xA + @Ѯ= eFcBV9TG<պt .}WBNf[1EW^Q34czHVVG@p%D4g=']~˲*A, \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/objects/d4/31809a4ded1399fbe0203a92eca627d40c873a b/test/integration/searchingInStagingPanel/expected/.git_keep/objects/d4/31809a4ded1399fbe0203a92eca627d40c873a deleted file mode 100644 index 5f4a559f78de27c8bb919685b9eb1b1af3c8b695..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAJ3IZ_@1zqP9*$dL0?)*SRa5cwBXF4c2&M-#s_~r<1A63+=>#{t$ z#SDkOt6B^^CoNh;gaskFHa7{8yeJ^CCr=FG%vN@N4Y3JlO1V-kAv&OpnlU2R)`(kT zCq9r%rhNK+-R*6%=i7AEZ&|jdp6a?>MiZk?(IvJ=1OPMEajNT|xGC@1`~bSXI50VB BLlyu4 diff --git a/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master index 77161f5b9..74947c528 100644 --- a/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master +++ b/test/integration/searchingInStagingPanel/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -d431809a4ded1399fbe0203a92eca627d40c873a +364e6307f708c6f17d83c7309aaf9a3034210236 diff --git a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG index 877ad0ddb..3d0b7b54d 100644 --- a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG @@ -14,14 +14,14 @@ myfile3 # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# Date: Mon Apr 5 11:49:51 2021 +1000 +# Date: Tue Apr 6 11:12:11 2021 +1000 # -# interactive rebase in progress; onto e11ec0e +# interactive rebase in progress; onto a59b3d4 # Last commands done (4 commands done): -# drop 110df01 myfile4 -# fixup 07cf881 myfile5 +# drop 88fb48b myfile4 +# fixup a1cf779 myfile5 # No commands remaining. -# You are currently rebasing branch 'master' on 'e11ec0e'. +# You are currently rebasing branch 'master' on 'a59b3d4'. # # Changes to be committed: # new file: myfile2 diff --git a/test/integration/squash/expected/.git_keep/ORIG_HEAD b/test/integration/squash/expected/.git_keep/ORIG_HEAD index cbe313f37..2b380f442 100644 --- a/test/integration/squash/expected/.git_keep/ORIG_HEAD +++ b/test/integration/squash/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa +3c752371dc0c58af7ff63f7a6c252da9f4d96251 diff --git a/test/integration/squash/expected/.git_keep/index b/test/integration/squash/expected/.git_keep/index index d085b3efb838d3b3a202b9252d4fe0f113a0b43f..755c639e2996f6b93912c1f1343671f6df478b13 100644 GIT binary patch delta 146 zcmZ3h_3QR+! zj@eAi0ZAR!XTICW)P9n`BtWc~x?K K=giG3{sI68_BG)E diff --git a/test/integration/squash/expected/.git_keep/logs/HEAD b/test/integration/squash/expected/.git_keep/logs/HEAD index f43c62dc8..295964da2 100644 --- a/test/integration/squash/expected/.git_keep/logs/HEAD +++ b/test/integration/squash/expected/.git_keep/logs/HEAD @@ -1,10 +1,10 @@ -0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587391 +1000 commit (initial): myfile1 -e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587391 +1000 commit: myfile2 -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI 1617587391 +1000 commit: myfile3 -20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI 1617587391 +1000 commit: myfile4 -110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI 1617587391 +1000 commit: myfile5 -07cf881fb6557a9676ff388420433cf375a3565e e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587392 +1000 rebase -i (start): checkout e11ec0e7a753a2cc10e348948173064e17d127d6 -e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587392 +1000 rebase -i: fast-forward -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 071c49e226b0040e0ecc3494417193357104914d CI 1617587395 +1000 rebase -i (squash): # This is a combination of 2 commits. -071c49e226b0040e0ecc3494417193357104914d 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (fixup): myfile2 -47e0e1f091e2be405f3e23e75eede4f6e392eda3 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (finish): returning to refs/heads/master +0000000000000000000000000000000000000000 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671531 +1000 commit (initial): myfile1 +a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671531 +1000 commit: myfile2 +3c752371dc0c58af7ff63f7a6c252da9f4d96251 9f83377e9068d956fe3085934bb32ce22aeb4bf7 CI 1617671531 +1000 commit: myfile3 +9f83377e9068d956fe3085934bb32ce22aeb4bf7 88fb48b35f6ece4da3ad62dd3426bca0240d63a5 CI 1617671531 +1000 commit: myfile4 +88fb48b35f6ece4da3ad62dd3426bca0240d63a5 a1cf7798606057d592f8ef1bee884165b6f629f1 CI 1617671531 +1000 commit: myfile5 +a1cf7798606057d592f8ef1bee884165b6f629f1 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671533 +1000 rebase -i (start): checkout a59b3d4800dcbf39ab31887402dc178e7b7f82a5 +a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671533 +1000 rebase -i: fast-forward +3c752371dc0c58af7ff63f7a6c252da9f4d96251 c59791a0d43d3e0a7ed0a40a62b7929acf675bf0 CI 1617671536 +1000 rebase -i (squash): # This is a combination of 2 commits. +c59791a0d43d3e0a7ed0a40a62b7929acf675bf0 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (fixup): myfile2 +075bd21694c75fd12e11cbd487eb64d831362e8c 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 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 index ef591b30e..e7e0b635b 100644 --- a/test/integration/squash/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/squash/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,6 @@ -0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI 1617587391 +1000 commit (initial): myfile1 -e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI 1617587391 +1000 commit: myfile2 -b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI 1617587391 +1000 commit: myfile3 -20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI 1617587391 +1000 commit: myfile4 -110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI 1617587391 +1000 commit: myfile5 -07cf881fb6557a9676ff388420433cf375a3565e 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI 1617587395 +1000 rebase -i (finish): refs/heads/master onto e11ec0e7a753a2cc10e348948173064e17d127d6 +0000000000000000000000000000000000000000 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671531 +1000 commit (initial): myfile1 +a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671531 +1000 commit: myfile2 +3c752371dc0c58af7ff63f7a6c252da9f4d96251 9f83377e9068d956fe3085934bb32ce22aeb4bf7 CI 1617671531 +1000 commit: myfile3 +9f83377e9068d956fe3085934bb32ce22aeb4bf7 88fb48b35f6ece4da3ad62dd3426bca0240d63a5 CI 1617671531 +1000 commit: myfile4 +88fb48b35f6ece4da3ad62dd3426bca0240d63a5 a1cf7798606057d592f8ef1bee884165b6f629f1 CI 1617671531 +1000 commit: myfile5 +a1cf7798606057d592f8ef1bee884165b6f629f1 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (finish): refs/heads/master onto a59b3d4800dcbf39ab31887402dc178e7b7f82a5 diff --git a/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d b/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d deleted file mode 100644 index bf6740609ae67442ace9bcdd18503405d5507a2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmV;@04@J`0fmmiN(30PU;l4(`8yg-`oi4a6n{ z)I!!DtnV57)dq8q%U1HwIOtyNF^Q%(NC zha0YT@Vul7eHi-flvZx3tWYAD&!Efd{uk920j%v-L6%ziMUG14_n0nX)F1Xs@y)@` M{Gg;h0O{dhyY<^>-v9sr diff --git a/test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c b/test/integration/squash/expected/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c new file mode 100644 index 0000000000000000000000000000000000000000..646d1891cca5efa76161748d8ae35ce9c6e3e6f1 GIT binary patch literal 157 zcmV;O0Al}m0fml13c@fDMP26<*$a}%G|2=+gsyswBs0N+v86=N+uKF=?jE1_;gzMe zxod0i)He|gnUJ_f6d+A3INjxw+WM4BS=vp5hu{M^1bqf$jM~>ds>>hUAG&JaIzPp# L15o_{Uj03z)dfqK literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e b/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e deleted file mode 100644 index 462faf5e89d692c9c0b8b4cfbd1b29d118ecf11f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeKzJ-82zIgr540O|rp4V@rvkzqe2DI?TZ2wY9lh zyz;5 z9Qf3CGfy?5G6;kO98yJoV2qM-kZ2l-gOn@-x-IYa>Yl(T;GuxjqFRuJGNizyYFe>^ z7A{0Czx#9D{W$sSINj}&+qT%HtnKFUNJ`Q$pg$u3xPu;3-Tu^F`__3ec0X5p=yT=0VR&G6hbUaSPCzIB|3>2VG!RbYIZ*K)og|&z4eQr`T;dWB9hGP0!QGO z3M3|G!|(Rk4m-{EI?Z?eaNVDJk*(e=j1YVbn82RFIcK`&r|$gAsPqQAU`5~X!_Em0qYj=%|jvWpL^%Vg?o%NjR@+VjATbETx{Q%6Z FIv@4hN7MiS literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 b/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 deleted file mode 100644 index 7418a5b13e759e42f053bc1cb941ce858f9e2308..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0fml13d0}}0DJZo-V4Qb)m12^kW-#v*Odlh6M}{I_st>q-iBcg!%J&Z z*Vf>vZz38V5o4(d1!62Eb7e_T43^3jFb2+^2%K8;CaKUTpUb9)QD2AgE}z`iSuVV^n}z`7BVhu424jrc?LO7zPwtOgwQrqfvFZR+ IKN(;>8D!8zwEzGB diff --git a/test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 b/test/integration/squash/expected/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 new file mode 100644 index 0000000000000000000000000000000000000000..697df39510722c0d8a95daf56865f5de5ab216c1 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeKzJ-E0yN5qjz~lDfe{V@rvkzqe2DItH^X3M+2x=l3_g`f!}K9ZNJ1koqrQpio} zT-L&+29w|Yx$brt?R6OM`pIou^fImOX7NZ$Ku>7T2mt1w$5hupb<@6eUX;xbyv8`C DXwXTt literal 0 HcmV?d00001 diff --git a/test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 b/test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 new file mode 100644 index 000000000..07a311e40 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 @@ -0,0 +1,3 @@ +xK +0@] W1,[J=xt C8]2rIP5 *T +q<ǃ,f]^"1CeDZfՄ)ҠG0udt)^B2D{91ܴ.OA*7: \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 b/test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 new file mode 100644 index 000000000..cb0e899e7 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 @@ -0,0 +1,2 @@ +xA +0@Q9d&icLR"~絵^wU +8b-ɱO։JipTuDI&:XDEHJ8 )ulK F0Np~m^0'3ZkQrӾu^ԛv; \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 b/test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 new file mode 100644 index 000000000..5bd43ffee --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 @@ -0,0 +1,2 @@ +xA +0@ѮsʌJ\yL")#tyS5[˥*`5df 9Px^%s^ui4=xz+!;9i'w+0, \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa b/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa deleted file mode 100644 index 7d8b697786bc5ddb090a0dabef7c281833a6c413..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQTsByQ)p>1ExVLl%iUNL`mvQo}wcv&dpF=Kr&m}_0_E+Y6j)RgHJAJ1oa_Gh{zr& zC~`r^g-m+)$GY2bve$9C>nFACsh7OAn?*t%B6~r5MgTBJJ*K+;$xZv#<*Cm60E_!M EmK+^S_5c6? diff --git a/test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 b/test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 new file mode 100644 index 000000000..138c93f07 --- /dev/null +++ b/test/integration/squash/expected/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 @@ -0,0 +1 @@ +xJ1 `}ifED}MvTз*E/? ܀PߵUGKM@x8"%&QW^eiS1D9;hZ' _\W8t~7.׋C-HV}ڟjn\yb>/r]&06 n+(m"G{1v3?i;`E \ No newline at end of file diff --git a/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 b/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 deleted file mode 100644 index bf8f83204..000000000 --- a/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Ѯsʌ\yL#tyS5[˥*`ŏ2RTQ+w>e4y0 S>uoc1T_xBYYhxv!asU7e-9kSA literal 0 HcmV?d00001 diff --git a/test/integration/tags/expected/.git_keep/info/exclude b/test/integration/tags/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/tags/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/tags/expected/.git_keep/logs/HEAD b/test/integration/tags/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..35076f038 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/logs/HEAD @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 CI 1617671537 +1000 commit (initial): file0 +1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 9d577efe8be29a993269a0a737ca9c8321a2adc2 CI 1617671537 +1000 commit: file1 diff --git a/test/integration/tags/expected/.git_keep/logs/refs/heads/master b/test/integration/tags/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..35076f038 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 CI 1617671537 +1000 commit (initial): file0 +1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 9d577efe8be29a993269a0a737ca9c8321a2adc2 CI 1617671537 +1000 commit: file1 diff --git a/test/integration/tags/expected/.git_keep/objects/1d/2a22db54ab37b582dc5e3c4ca660f06cdb4692 b/test/integration/tags/expected/.git_keep/objects/1d/2a22db54ab37b582dc5e3c4ca660f06cdb4692 new file mode 100644 index 0000000000000000000000000000000000000000..a5426bded72547a670fce1cb82fdcf15281a7e28 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NvDYc5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lF_@E1>k!sTG*ysY=8z;YvQNB+drapIkq Yaqx5%W;SO%CmnxsQ`QY^e%wDR@@-u=SO5S3 literal 0 HcmV?d00001 diff --git a/test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 0000000000000000000000000000000000000000..06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c GIT binary patch literal 21 ccmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/tags/expected/.git_keep/objects/9d/577efe8be29a993269a0a737ca9c8321a2adc2 b/test/integration/tags/expected/.git_keep/objects/9d/577efe8be29a993269a0a737ca9c8321a2adc2 new file mode 100644 index 0000000000000000000000000000000000000000..882b0e7977a6d534f170508b070ac5c27c6399c0 GIT binary patch literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeKz{BpU-FLQj3hX0yS9v86=t`SuB3hZz`IdtZii z8Bb$ZwG|SHWD&?L%ve3OB8hWs)hl|SkOKv0Hs1ApgcTXFmKeDBRN@t@MD-GciJ$>V zErBu`{*33k+iAA9X@2OJ`}Wd{to?2sxkSlDpX}KIfH~+fHS|y2wB@DF`~c6SItG25 BMf?B& literal 0 HcmV?d00001 diff --git a/test/integration/tags/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags/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/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/tags/expected/.git_keep/refs/heads/master b/test/integration/tags/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..027894ce8 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +9d577efe8be29a993269a0a737ca9c8321a2adc2 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag1 b/test/integration/tags/expected/.git_keep/refs/tags/tag1 new file mode 100644 index 000000000..027894ce8 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/tags/tag1 @@ -0,0 +1 @@ +9d577efe8be29a993269a0a737ca9c8321a2adc2 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag3 b/test/integration/tags/expected/.git_keep/refs/tags/tag3 new file mode 100644 index 000000000..027894ce8 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/tags/tag3 @@ -0,0 +1 @@ +9d577efe8be29a993269a0a737ca9c8321a2adc2 diff --git a/test/integration/tags/expected/.git_keep/refs/tags/tag4 b/test/integration/tags/expected/.git_keep/refs/tags/tag4 new file mode 100644 index 000000000..3ee82d743 --- /dev/null +++ b/test/integration/tags/expected/.git_keep/refs/tags/tag4 @@ -0,0 +1 @@ +1d2a22db54ab37b582dc5e3c4ca660f06cdb4692 diff --git a/test/integration/tags/expected/file0 b/test/integration/tags/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/tags/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/tags/expected/file1 b/test/integration/tags/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/tags/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/tags/recording.json b/test/integration/tags/recording.json new file mode 100644 index 000000000..06a606247 --- /dev/null +++ b/test/integration/tags/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":525,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1117,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1245,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1700,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1908,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1988,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2100,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2252,"Mod":0,"Key":256,"Ch":49},{"Timestamp":2486,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2796,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3324,"Mod":0,"Key":256,"Ch":116},{"Timestamp":3412,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3532,"Mod":0,"Key":256,"Ch":103},{"Timestamp":3860,"Mod":0,"Key":256,"Ch":50},{"Timestamp":4036,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4340,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4508,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4564,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4684,"Mod":0,"Key":256,"Ch":103},{"Timestamp":4908,"Mod":0,"Key":256,"Ch":51},{"Timestamp":5132,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5804,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5996,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6245,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6580,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6852,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7437,"Mod":0,"Key":256,"Ch":84},{"Timestamp":7749,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7820,"Mod":0,"Key":256,"Ch":97},{"Timestamp":7924,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8483,"Mod":0,"Key":256,"Ch":52},{"Timestamp":8805,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9357,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/tags/setup.sh b/test/integration/tags/setup.sh new file mode 100644 index 000000000..75cd7a91b --- /dev/null +++ b/test/integration/tags/setup.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 diff --git a/test/integration/tags/test.json b/test/integration/tags/test.json new file mode 100644 index 000000000..05914d80f --- /dev/null +++ b/test/integration/tags/test.json @@ -0,0 +1 @@ +{ "description": "basic CRUD for tags", "speed": 1 }