From 5e6e1617aa9a97b6f13bfeddc43f27844a6468cd Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 26 Jan 2022 16:46:54 +1100 Subject: [PATCH] add another bisect integration test --- pkg/commands/git_commands/bisect.go | 2 +- pkg/integration/integration.go | 5 ++-- test/integration/bisect/setup.sh | 2 ++ .../expected/.git_keep/BISECT_ANCESTORS_OK | 0 .../expected/.git_keep/BISECT_EXPECTED_REV | 1 + .../expected/.git_keep/BISECT_LOG | 8 ++++++ .../expected/.git_keep/BISECT_NAMES | 1 + .../expected/.git_keep/BISECT_START | 1 + .../expected/.git_keep/BISECT_TERMS | 2 ++ .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 0 .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/config | 10 +++++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 137 bytes .../expected/.git_keep/info/exclude | 7 +++++ .../expected/.git_keep/logs/HEAD | 26 +++++++++++++++++ .../expected/.git_keep/logs/refs/heads/master | 1 + .../expected/.git_keep/logs/refs/heads/other | 21 ++++++++++++++ .../expected/.git_keep/logs/refs/heads/test | 1 + .../00/750edc07d6415dcc07ae0351e9397b0222b7ba | Bin 0 -> 17 bytes .../03/ecdaa424af1fdaeab1bd1852319652b9518f11 | Bin 0 -> 76 bytes .../04/a577be2858b8024716876aefe6b665a98e1e4f | Bin 0 -> 76 bytes .../05/57fc43da38567eae00831e9b385fd2cad22643 | Bin 0 -> 76 bytes .../06/4b01d296b5d0a6d829b2c6da812000909144a3 | Bin 0 -> 147 bytes .../0b/148673b6c3595b97542fcd5b5e97a568ea26b0 | 2 ++ .../0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f | Bin 0 -> 17 bytes .../0d/1bbe8d012c8c070167a006a4898b525cfbd930 | Bin 0 -> 76 bytes .../1e/8b314962144c26d5e0e50fd29d2ca327864913 | Bin 0 -> 17 bytes .../20/9e3ef4b6247ce746048d5711befda46206d235 | Bin 0 -> 18 bytes .../26/661287266e53bda69d8daa3aac1f714650f13c | Bin 0 -> 76 bytes .../2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 | 2 ++ .../30/4e25b1cbcd673476a98779d817b4d87feba619 | Bin 0 -> 148 bytes .../31/df6c951dc82b75b11bc48836e780134a16e6ad | Bin 0 -> 76 bytes .../3a/05ed1ca9671bc362c7197eb09bddff040c9110 | Bin 0 -> 76 bytes .../3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 | Bin 0 -> 76 bytes .../3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 | Bin 0 -> 18 bytes .../3d/f063bdb2fd238bdf7bda23290b7da497589258 | Bin 0 -> 147 bytes .../3e/94c347542e28f329499237920a81240575a1f4 | Bin 0 -> 121 bytes .../41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 | Bin 0 -> 147 bytes .../43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb | Bin 0 -> 76 bytes .../45/a4fb75db864000d01701c0f7a51864bd4daabf | Bin 0 -> 17 bytes .../48/082f72f087ce7e6fa75b9c41d7387daecd447b | Bin 0 -> 18 bytes .../4a/9e01012c736e5e0998b7184d9a54e8c610ed02 | Bin 0 -> 77 bytes .../54/5ee64d47536092ef63907a18995827a74fa77d | Bin 0 -> 147 bytes .../60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 | Bin 0 -> 18 bytes .../68/1e7676f6bd15140ad8d51345914d0b7fa69489 | 3 ++ .../72/e695b433526c667e356788b961ebe192878531 | Bin 0 -> 149 bytes .../74/cd0e856d938eb6b665284c5485c00f87e20dc5 | Bin 0 -> 51 bytes .../78/7e69fd95b7075de9290439e54677d023ea92c7 | Bin 0 -> 148 bytes .../7c/fd51ebd06287effcfdab241235305cb6439d40 | Bin 0 -> 76 bytes .../7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 | Bin 0 -> 17 bytes .../7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 | Bin 0 -> 17 bytes .../83/51c19397f4fcd5238d10034fa7fa384f14d580 | Bin 0 -> 18 bytes .../84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 | Bin 0 -> 146 bytes .../88/8633a131a49f1b8981d70c13d666defed6ba15 | Bin 0 -> 77 bytes .../8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 | Bin 0 -> 76 bytes .../90/dfebd90b0a89766c39928f22901b8c02b51fda | 1 + .../93/feecfa069adae620503f0ea027c4d7d368efcc | Bin 0 -> 148 bytes .../96/095b64429648b96e25b3a02a5ccd43c61cafef | Bin 0 -> 150 bytes .../96/f59302fbb47e8abb38d110328500055c2eae8f | 2 ++ .../98/d9bcb75a685dfbfd60f611c309410152935b3d | Bin 0 -> 18 bytes .../9d/33ec0915534bf6401be9412203697791e40a04 | 1 + .../9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 | Bin 0 -> 148 bytes .../b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e | Bin 0 -> 18 bytes .../b4/de3947675361a7770d29b8982c407b0ec6b2a0 | Bin 0 -> 18 bytes .../b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 | Bin 0 -> 18 bytes .../b8/626c4cff2849624fb67f87cd0ad72b163671ad | Bin 0 -> 17 bytes .../b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 | Bin 0 -> 147 bytes .../be/3e8df868feac07f915a39aaceb886aeca56442 | Bin 0 -> 147 bytes .../cd/c58c0f95a2313ded9185e102bc35253f6a1bed | Bin 0 -> 76 bytes .../d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d | Bin 0 -> 17 bytes .../d2/022605750ce8c6d2fd703df624fc1e191b799a | Bin 0 -> 148 bytes .../d3/6e09d97bf2c1527118bde353ad64b157f8b269 | 1 + .../d4/e982570808a24722649e852a92bda5cf54c9dd | Bin 0 -> 76 bytes .../d6/b24041cf04154f8f902651969675021f4d93a5 | Bin 0 -> 18 bytes .../d9/89cb769db41caf40f46f40aaa421568ee0d6bc | 3 ++ .../da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 | Bin 0 -> 76 bytes .../db/76c03074879025735b647b825786a7b3fcfe7c | Bin 0 -> 76 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes .../ec/635144f60048986bc560c5576355344005e6e7 | Bin 0 -> 17 bytes .../f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 | Bin 0 -> 18 bytes .../f5/9b0d2e37845a8d46ee072354598e8246f98324 | Bin 0 -> 147 bytes .../expected/.git_keep/packed-refs | 1 + .../expected/.git_keep/refs/bisect/bad | 1 + ...d-064b01d296b5d0a6d829b2c6da812000909144a3 | 1 + ...d-545ee64d47536092ef63907a18995827a74fa77d | 1 + ...d-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 | 1 + .../expected/.git_keep/refs/heads/master | 1 + .../expected/.git_keep/refs/heads/other | 1 + .../expected/.git_keep/refs/heads/test | 1 + .../bisectFromOtherBranch/expected/myfile | 0 .../bisectFromOtherBranch/recording.json | 1 + .../bisectFromOtherBranch/setup.sh | 27 ++++++++++++++++++ .../bisectFromOtherBranch/test.json | 4 +++ test/integration/branchAutocomplete/setup.sh | 2 ++ test/integration/branchDelete/setup.sh | 2 ++ test/integration/branchRebase/setup.sh | 2 ++ test/integration/branchReset/setup.sh | 2 ++ test/integration/branchSuggestions/setup.sh | 2 ++ test/integration/cherryPicking/setup.sh | 2 ++ test/integration/commit/setup.sh | 2 ++ test/integration/commitsNewBranch/setup.sh | 2 ++ test/integration/commitsRevert/setup.sh | 2 ++ test/integration/confirmQuit/setup.sh | 2 ++ test/integration/customCommands/setup.sh | 2 ++ .../customCommandsComplex/setup.sh | 2 ++ test/integration/diffing/setup.sh | 2 ++ test/integration/diffing2/setup.sh | 2 ++ test/integration/diffing3/setup.sh | 2 ++ test/integration/discardFileChanges/setup.sh | 2 ++ .../discardOldFileChanges/setup.sh | 2 ++ test/integration/filterPath/setup.sh | 2 ++ test/integration/filterPath2/setup.sh | 2 ++ test/integration/filterPath3/setup.sh | 2 ++ test/integration/forcePush/setup.sh | 2 ++ test/integration/initialOpen/setup.sh | 2 ++ test/integration/mergeConflictRevert/setup.sh | 2 ++ test/integration/mergeConflictUndo/setup.sh | 2 ++ test/integration/mergeConflicts/setup.sh | 2 ++ .../mergeConflictsResolvedExternally/setup.sh | 2 ++ test/integration/patchBuilding/setup.sh | 2 ++ test/integration/patchBuilding2/setup.sh | 2 ++ .../patchBuildingWithFiletree/setup.sh | 2 ++ test/integration/pull/setup.sh | 2 ++ test/integration/pullAndSetUpstream/setup.sh | 2 ++ test/integration/pullMerge/setup.sh | 2 ++ test/integration/pullMergeConflict/setup.sh | 2 ++ test/integration/pullRebase/setup.sh | 2 ++ test/integration/pullRebaseConflict/setup.sh | 2 ++ .../pullRebaseInteractive/setup.sh | 2 ++ .../pullRebaseInteractiveWithDrop/setup.sh | 2 ++ test/integration/push/setup.sh | 2 ++ test/integration/pushAndSetUpstream/setup.sh | 2 ++ .../pushAndSetUpstreamDefault/setup.sh | 2 ++ test/integration/pushFollowTags/setup.sh | 2 ++ test/integration/pushNoFollowTags/setup.sh | 2 ++ test/integration/pushTag/setup.sh | 2 ++ test/integration/pushWithCredentials/setup.sh | 2 ++ test/integration/rebase/setup.sh | 2 ++ test/integration/rebase2/setup.sh | 2 ++ test/integration/rebase3/setup.sh | 2 ++ .../integration/rebaseFixupAndSquash/setup.sh | 2 ++ test/integration/rebaseFixups/setup.sh | 2 ++ .../rebaseRewordLastCommit/setup.sh | 2 ++ .../rebaseRewordOldCommit/setup.sh | 2 ++ test/integration/rebaseSwapping/setup.sh | 2 ++ test/integration/reflogCheckout/setup.sh | 2 ++ test/integration/reflogCherryPick/setup.sh | 2 ++ test/integration/reflogCommitFiles/setup.sh | 2 ++ test/integration/reflogHardReset/setup.sh | 2 ++ .../rememberCommitMessageAfterFail/setup.sh | 2 ++ test/integration/searching/setup.sh | 2 ++ .../searchingInStagingPanel/setup.sh | 2 ++ test/integration/setUpstream/setup.sh | 2 ++ test/integration/squash/setup.sh | 2 ++ .../staginWithDiffContextChange/setup.sh | 2 ++ test/integration/stagingTwo/setup.sh | 2 ++ test/integration/stash/setup.sh | 2 ++ test/integration/stashDrop/setup.sh | 2 ++ test/integration/stashNewBranch/setup.sh | 2 ++ test/integration/stashPop/setup.sh | 2 ++ test/integration/stash_Copy/setup.sh | 2 ++ test/integration/switchTabFromMenu/setup.sh | 2 ++ test/integration/tags/setup.sh | 2 ++ test/integration/tags2/setup.sh | 2 ++ test/integration/tags3/setup.sh | 2 ++ test/integration/tags4/setup.sh | 2 ++ test/integration/undo/setup.sh | 2 ++ test/integration/undo2/setup.sh | 2 ++ 170 files changed, 293 insertions(+), 3 deletions(-) create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_ANCESTORS_OK create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/config create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/description create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/index create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/4e25b1cbcd673476a98779d817b4d87feba619 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77d create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/packed-refs create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test create mode 100644 test/integration/bisectFromOtherBranch/expected/myfile create mode 100644 test/integration/bisectFromOtherBranch/recording.json create mode 100644 test/integration/bisectFromOtherBranch/setup.sh create mode 100644 test/integration/bisectFromOtherBranch/test.json diff --git a/pkg/commands/git_commands/bisect.go b/pkg/commands/git_commands/bisect.go index c72eaee52..b032afc45 100644 --- a/pkg/commands/git_commands/bisect.go +++ b/pkg/commands/git_commands/bisect.go @@ -166,7 +166,7 @@ func (self *BisectCommands) IsDone() (bool, []string, error) { func (self *BisectCommands) ReachableFromStart(ref string, startRef string) bool { err := self.cmd.New( fmt.Sprintf("git merge-base --is-ancestor %s %s", startRef, ref), - ).Run() + ).DontLog().Run() return err == nil } diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go index 3ac6f0c8c..1158fa85f 100644 --- a/pkg/integration/integration.go +++ b/pkg/integration/integration.go @@ -2,6 +2,7 @@ package integration import ( "encoding/json" + "errors" "fmt" "io/ioutil" "log" @@ -251,8 +252,8 @@ func createFixture(testPath, actualDir string) error { bashScriptPath := filepath.Join(testPath, "setup.sh") cmd := secureexec.Command("bash", bashScriptPath, actualDir) - if _, err := cmd.CombinedOutput(); err != nil { - return err + if output, err := cmd.CombinedOutput(); err != nil { + return errors.New(string(output)) } return nil diff --git a/test/integration/bisect/setup.sh b/test/integration/bisect/setup.sh index a15abc2bc..6aa3bf7df 100644 --- a/test/integration/bisect/setup.sh +++ b/test/integration/bisect/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_ANCESTORS_OK b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_ANCESTORS_OK new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV new file mode 100644 index 000000000..c86a4ce34 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV @@ -0,0 +1 @@ +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG new file mode 100644 index 000000000..7aae44d66 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG @@ -0,0 +1,8 @@ +# bad: [96f59302fbb47e8abb38d110328500055c2eae8f] commit 18 +# good: [064b01d296b5d0a6d829b2c6da812000909144a3] commit 13 +git bisect start 'other~2' 'other~7' +# good: [545ee64d47536092ef63907a18995827a74fa77d] commit 15 +git bisect good 545ee64d47536092ef63907a18995827a74fa77d +# good: [b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35] commit 17 +git bisect good b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 +# first bad commit: [96f59302fbb47e8abb38d110328500055c2eae8f] commit 18 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES @@ -0,0 +1 @@ + diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START new file mode 100644 index 000000000..1f7391f92 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START @@ -0,0 +1 @@ +master diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS new file mode 100644 index 000000000..25dd30b14 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS @@ -0,0 +1,2 @@ +bad +good diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG b/test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..e6cf6d392 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +commit 20 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/FETCH_HEAD b/test/integration/bisectFromOtherBranch/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD b/test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD new file mode 100644 index 000000000..cea9d05ed --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/test diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/config b/test/integration/bisectFromOtherBranch/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/description b/test/integration/bisectFromOtherBranch/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/index b/test/integration/bisectFromOtherBranch/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..f619b9dc55d5bd139b8b068bef3f8ad7c840e697 GIT binary patch literal 137 zcmZ?q402{*U|<4b#>5Zzzbo~n&jHbj$^3bY3=FJH8Y!0;7#f!VrN08zhyXFev$>CE zZ@PHR*}GeFU3t`vLr;2wCo-_*R;FdxDZf5dxK(MO4$`Lsds+l~5m2d8W9YhPsi7XTULFgXAK literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude b/test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/bisectFromOtherBranch/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/bisectFromOtherBranch/expected/.git_keep/logs/HEAD b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..a47298e4b --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD @@ -0,0 +1,26 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 commit (initial): first commit +3e94c347542e28f329499237920a81240575a1f4 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 checkout: moving from master to other +3e94c347542e28f329499237920a81240575a1f4 787e69fd95b7075de9290439e54677d023ea92c7 CI 1643175915 +1100 commit: commit 1 +787e69fd95b7075de9290439e54677d023ea92c7 847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 CI 1643175915 +1100 commit: commit 2 +847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 d2022605750ce8c6d2fd703df624fc1e191b799a CI 1643175915 +1100 commit: commit 3 +d2022605750ce8c6d2fd703df624fc1e191b799a 681e7676f6bd15140ad8d51345914d0b7fa69489 CI 1643175915 +1100 commit: commit 4 +681e7676f6bd15140ad8d51345914d0b7fa69489 3df063bdb2fd238bdf7bda23290b7da497589258 CI 1643175915 +1100 commit: commit 5 +3df063bdb2fd238bdf7bda23290b7da497589258 2d0d5709569edc32bd9ee891dc0645e7b7bf2061 CI 1643175915 +1100 commit: commit 6 +2d0d5709569edc32bd9ee891dc0645e7b7bf2061 9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 CI 1643175915 +1100 commit: commit 7 +9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 93feecfa069adae620503f0ea027c4d7d368efcc CI 1643175915 +1100 commit: commit 8 +93feecfa069adae620503f0ea027c4d7d368efcc 41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 CI 1643175915 +1100 commit: commit 9 +41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 d989cb769db41caf40f46f40aaa421568ee0d6bc CI 1643175915 +1100 commit: commit 10 +d989cb769db41caf40f46f40aaa421568ee0d6bc f59b0d2e37845a8d46ee072354598e8246f98324 CI 1643175915 +1100 commit: commit 11 +f59b0d2e37845a8d46ee072354598e8246f98324 304e25b1cbcd673476a98779d817b4d87feba619 CI 1643175915 +1100 commit: commit 12 +304e25b1cbcd673476a98779d817b4d87feba619 064b01d296b5d0a6d829b2c6da812000909144a3 CI 1643175915 +1100 commit: commit 13 +064b01d296b5d0a6d829b2c6da812000909144a3 72e695b433526c667e356788b961ebe192878531 CI 1643175915 +1100 commit: commit 14 +72e695b433526c667e356788b961ebe192878531 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 commit: commit 15 +545ee64d47536092ef63907a18995827a74fa77d be3e8df868feac07f915a39aaceb886aeca56442 CI 1643175915 +1100 commit: commit 16 +be3e8df868feac07f915a39aaceb886aeca56442 b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175915 +1100 commit: commit 17 +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 96f59302fbb47e8abb38d110328500055c2eae8f CI 1643175915 +1100 commit: commit 18 +96f59302fbb47e8abb38d110328500055c2eae8f 96095b64429648b96e25b3a02a5ccd43c61cafef CI 1643175915 +1100 commit: commit 19 +96095b64429648b96e25b3a02a5ccd43c61cafef 0b148673b6c3595b97542fcd5b5e97a568ea26b0 CI 1643175915 +1100 commit: commit 20 +0b148673b6c3595b97542fcd5b5e97a568ea26b0 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 checkout: moving from other to master +3e94c347542e28f329499237920a81240575a1f4 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 checkout: moving from master to 545ee64d47536092ef63907a18995827a74fa77d +545ee64d47536092ef63907a18995827a74fa77d b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175918 +1100 checkout: moving from 545ee64d47536092ef63907a18995827a74fa77d to b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 3e94c347542e28f329499237920a81240575a1f4 CI 1643175923 +1100 checkout: moving from b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 to test diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..b89685177 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 commit (initial): first commit diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other new file mode 100644 index 000000000..83bcfea8a --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other @@ -0,0 +1,21 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 branch: Created from HEAD +3e94c347542e28f329499237920a81240575a1f4 787e69fd95b7075de9290439e54677d023ea92c7 CI 1643175915 +1100 commit: commit 1 +787e69fd95b7075de9290439e54677d023ea92c7 847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 CI 1643175915 +1100 commit: commit 2 +847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 d2022605750ce8c6d2fd703df624fc1e191b799a CI 1643175915 +1100 commit: commit 3 +d2022605750ce8c6d2fd703df624fc1e191b799a 681e7676f6bd15140ad8d51345914d0b7fa69489 CI 1643175915 +1100 commit: commit 4 +681e7676f6bd15140ad8d51345914d0b7fa69489 3df063bdb2fd238bdf7bda23290b7da497589258 CI 1643175915 +1100 commit: commit 5 +3df063bdb2fd238bdf7bda23290b7da497589258 2d0d5709569edc32bd9ee891dc0645e7b7bf2061 CI 1643175915 +1100 commit: commit 6 +2d0d5709569edc32bd9ee891dc0645e7b7bf2061 9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 CI 1643175915 +1100 commit: commit 7 +9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 93feecfa069adae620503f0ea027c4d7d368efcc CI 1643175915 +1100 commit: commit 8 +93feecfa069adae620503f0ea027c4d7d368efcc 41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 CI 1643175915 +1100 commit: commit 9 +41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 d989cb769db41caf40f46f40aaa421568ee0d6bc CI 1643175915 +1100 commit: commit 10 +d989cb769db41caf40f46f40aaa421568ee0d6bc f59b0d2e37845a8d46ee072354598e8246f98324 CI 1643175915 +1100 commit: commit 11 +f59b0d2e37845a8d46ee072354598e8246f98324 304e25b1cbcd673476a98779d817b4d87feba619 CI 1643175915 +1100 commit: commit 12 +304e25b1cbcd673476a98779d817b4d87feba619 064b01d296b5d0a6d829b2c6da812000909144a3 CI 1643175915 +1100 commit: commit 13 +064b01d296b5d0a6d829b2c6da812000909144a3 72e695b433526c667e356788b961ebe192878531 CI 1643175915 +1100 commit: commit 14 +72e695b433526c667e356788b961ebe192878531 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 commit: commit 15 +545ee64d47536092ef63907a18995827a74fa77d be3e8df868feac07f915a39aaceb886aeca56442 CI 1643175915 +1100 commit: commit 16 +be3e8df868feac07f915a39aaceb886aeca56442 b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175915 +1100 commit: commit 17 +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 96f59302fbb47e8abb38d110328500055c2eae8f CI 1643175915 +1100 commit: commit 18 +96f59302fbb47e8abb38d110328500055c2eae8f 96095b64429648b96e25b3a02a5ccd43c61cafef CI 1643175915 +1100 commit: commit 19 +96095b64429648b96e25b3a02a5ccd43c61cafef 0b148673b6c3595b97542fcd5b5e97a568ea26b0 CI 1643175915 +1100 commit: commit 20 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test new file mode 100644 index 000000000..5b8c1f1cf --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175923 +1100 branch: Created from master diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba new file mode 100644 index 0000000000000000000000000000000000000000..d3c45d51ea5d755dabd6e35ce0322533b264abdd GIT binary patch literal 17 YcmbHq)$ literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 new file mode 100644 index 0000000000000000000000000000000000000000..355004b9ecfdaf84db14c525047e90a089f0b6f3 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgW!RCF)K*wg=?Ym ixs_lQ&*nawz3JjLXYX#!b>&ev4n64!o(KTWJRSQQ*(7BE literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f new file mode 100644 index 0000000000000000000000000000000000000000..da9396d18b519565de1b74100a8adf4f949ce5cc GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgW!Q4h(mg#mad|nf=8hRU4%K|eHZ6e4 i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?DCt{vx}dm_C6 literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 new file mode 100644 index 0000000000000000000000000000000000000000..0ff3d683a82f9318d89e942addbc0a4ea1421b59 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWl)%B_hp+(&2u-F-f+Qvf0rb&T{4Br i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?DT3?4(k?;>&l literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 new file mode 100644 index 0000000000000000000000000000000000000000..41b1acb1795663b815b66856103390ccf03eb383 GIT binary patch literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlw|zq`O%V5qjz~vdM~qv86=t`S#!gWNyP8rYx;J zI-t;@Z)OnGBvw+~2}+@=Sj0gG6V=y!@Ff%bxNXyJgWvILMzv*7~8LbKx`;$j~?Y^!Nxs?f( i&#eTjcsBRZ>`fQ1IeT|&t}Bnaap*};@I(MCKOhO!ydil2 literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 new file mode 100644 index 0000000000000000000000000000000000000000..f1722ae0044d12235bc5ca37b7e8d52b3303d02d GIT binary patch literal 17 YcmbeA0Lwu05+rq@Bjb+ literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 new file mode 100644 index 0000000000000000000000000000000000000000..12e1f82f122993c9598b583241cad99aa966231d GIT binary patch literal 18 Zcmbz~})JgFru1JODkq1=9ck literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c new file mode 100644 index 0000000000000000000000000000000000000000..77e40c5af43f6756eb8ffde9e1c9a273347feea9 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWw2pZs93T{CMNLmN!y8qHL|OB_gsL= i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?D9zaAybd?RQ8 literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 new file mode 100644 index 000000000..8413068b9 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 @@ -0,0 +1,2 @@ +x; +@@QbzAfs~ "2/(8&\)\W݅}3sJEIg4 5U1F`F) +mu Yf,sf%@ҹX*lnen>$Kr!c{ݧޥ Z+T}H%am>0Ju|5!|P|1mCKQVC( z5)8Q(gEgemd)(I@mK&Ux+f_cPZ%;XuwO;_|CVGy@a75Hv&32v|@+bd!K%>4m(K;dG CPeAVg literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad new file mode 100644 index 0000000000000000000000000000000000000000..204aace94187223c3a29d2f08a20047216d02fd4 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWteeu&-SQ{*x!E>z6l=YbYu*g9Bm7g i&#eTjcsBRZ>`fQ1IeT|&t}Bnaap*};@I(LxvL5!7;2{41 literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 new file mode 100644 index 0000000000000000000000000000000000000000..1ede294e1ab755fe8ca68c45a4a6cc08de9f2940 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWnd`fyTg9XG4>4mI_AKameov3+jl|b ib1T6rp3QwUd(*{h&feXc>&l~U9D33dJP`nuqa5n!#Utzh literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 new file mode 100644 index 0000000000000000000000000000000000000000..00f0e017670c2d0c9ee4a4994d34458de210ee2e GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgW!SjaVw)BR!;)_+cuXG2M4kWjRHqIq ipIZr5@oes+*_$q2bN24mTvr}-+Y}TO#}b literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 new file mode 100644 index 0000000000000000000000000000000000000000..ecdb2d612f7d882a44c9abe5dc8d59f9032ac286 GIT binary patch literal 18 ZcmbV9Nt027x(DX#hd^25A5Q literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258 new file mode 100644 index 0000000000000000000000000000000000000000..baf2c12314324c0bbc8d6d2bf35792026b0ea01b GIT binary patch literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)vlnEh%}f#~B6QVbLT^ocxBGU$yudUsH~qxAKlPHgdIb_YlIsD(nF!Hz+NYZSssDUn^97TTIeLL_ BM|}VQ literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4 new file mode 100644 index 0000000000000000000000000000000000000000..e7ecc0e452dc4dd0be782d3ee7aab40dd4c90946 GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlzK4%_b>`2tD-~?PiMwLrPr1=UeatUWXY*YAKrm zF`cZbLiCbR6NfzXNtdvMz+LjfKCvLKDQbsV*v)Ty)CS`O*KxY*XD<6wFH*}5DEOWt b55#aLLUac`CZ>PtZr$3;;8(dX)_^W!O>8#x literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 new file mode 100644 index 0000000000000000000000000000000000000000..9cfa98a7215ba945716d5693bcb1445522015af7 GIT binary patch literal 147 zcmV;E0Brww0gcW<3c^4PKvCCoitGhRCT7|J5uvLdBh6$`u(p&DJic9c0JopF__oaR zqXA_(w9Or?nDmATXprWi9F{q99jv#n{=o zbcIvz)hy_{-Ioo95iY}c^N-H!(@(a{SDLioEkq9yDb)RbfC;xfK;S0LWJFR?< BONsyh literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb new file mode 100644 index 0000000000000000000000000000000000000000..23915f2bc8f06a0e661308e696ff1e4d23164426 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWoQmOIC=V)KUbA|1(^Mp|FZBGx!M4g i&#eTjcsBRZ>`fQ1IeT|&t}Bnaap*};@I(LyZXYm*lpt~d literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf new file mode 100644 index 0000000000000000000000000000000000000000..fdf2bc81d1e32f103ffac8e4afe9c1a2ff38c60a GIT binary patch literal 17 Ycmbz~m7VgTMr)1OPqU1=#=q literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 new file mode 100644 index 0000000000000000000000000000000000000000..3b4ccc564783d5a50463d644e2f8a1a0b27533db GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>6V=y!@Ff%bxNXyJgW%xStQFqsd8z+xedE|5+St_i1`tl~I jd~PLJ#k0AOW^cN9&DpzKb6t7VjYCg*f+qq1XEz~Kxd9-k literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77d b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77d new file mode 100644 index 0000000000000000000000000000000000000000..2567c1e4f562db5dd5b87c0bd9ef3e684985d736 GIT binary patch literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlw{|xSK492tD-~*>sD7v86=t`S#!gybd!kb!qL< z0fi5JGXwF{Y&wZoU$P|T8bv~$LlBRes}D*zPsOcevsZ@{jD_?ZBL%L^$s%#eS%uNm zaBowlh_1Z*ec50b;WCUj`;@jm?Npa`1>|$YM1llIMDN{B_o;4w>OUWl+!w+BId%LC BMXvw= literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 new file mode 100644 index 0000000000000000000000000000000000000000..d94cbe67d82850de2f8527e7aa60dbd605b2259b GIT binary patch literal 18 Zcmbz~m_tgTOSVWB@(}1?2z$ literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 new file mode 100644 index 000000000..4e3661a61 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 @@ -0,0 +1,3 @@ +xA +1 @Q=E4iNADH C,<[cSTO^**sʼna +L91N Ѭk@%K,GE*-o昒y||GSY0x25{ݧ2: \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531 new file mode 100644 index 0000000000000000000000000000000000000000..d70ff615898393700d77fae42114c14b1c88e685 GIT binary patch literal 149 zcmV;G0BZku0gcW<3c@fDKvCB@#q0%{NhWCqiU?ix7?UPJ!PrtFcznC?0B%2T@t3u= zM+cH{>U$}`P9))wvZGAZN5xtRlV``-*UHs};$lr^)4jYpVBmz5t%T$=YRJ(_vP;Ms z$s(el5VJa??|xr*m}VHK`BpyKwr9C4Yr6skb~Jb)4`(7obJSz1mp}Q>1F`u60^&LJ DvQkJG literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 new file mode 100644 index 0000000000000000000000000000000000000000..9888101455ffdc7410b4271ca3dfff619c4272ce GIT binary patch literal 51 zcmbN$tS--9r`^A+@P()U2NwqC HeL|uD>30-* literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7 new file mode 100644 index 0000000000000000000000000000000000000000..e8c75bad7ec55a33ed6beec366d6fba7c0159241 GIT binary patch literal 148 zcmV;F0Biqv0gcW*3IZ_@Kw;~gBE2A)$xM;~5n(Hjk)H_)uDdJ|Jic3a0Nck`yt>Tu zV^|PAj7`-xAJj>cSUOf6V=y!@Ff%bxNXyJgW$@t8FZ$4at}cIh^c=_Q7Pafnx>Q5u ib1T6rp3QwUd(*{h&feXc>&l~U9D33dJP`ottsc=Iyd_2e literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 new file mode 100644 index 0000000000000000000000000000000000000000..637482d7a82554db2176cef4841bccc3141df169 GIT binary patch literal 17 Ycmbz~mtlgTNG~Bmh0*1>OJv literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 new file mode 100644 index 0000000000000000000000000000000000000000..19c6201582e9ef9cf36ed9112e19c81fe8782f30 GIT binary patch literal 146 zcmV;D0B!$x0gaA93c@fD06pgwdlzIk*<@W15qjz~(qxN*v86=t`S#!gybc31Wohlv zfixcaW(HbAu!2f42A<}`NRug(_ZX6jC>di$c5B}3)j`f;N$09@5|mg?y&?y-$VsH4 z50=#zarxcv%Lc;;mtnlwC%5%!r?RvwP~t!m_a+>P5ZzAqscwJjKOemN0t$;bsoq#b AqyPW_ literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 new file mode 100644 index 0000000000000000000000000000000000000000..1c62650e27ecc52460141bf27de06c658029f918 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>6V=y!@Ff%bxNXyJgW!Sd-#+-}?r_x?#%?j+)Ic&Qvf5&2| jd~PLJ#k0AOW^cN9&DpzKb6t7VjYCg*f+qq1O%ou+0U9Dk literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 new file mode 100644 index 0000000000000000000000000000000000000000..f78367c1d2f726b5d815bda15726758235ab9a05 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWvK6Gl-q8b;C$)X?YTMvf>YONFn)r{ i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?D0tR1Kjfh6nz literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda new file mode 100644 index 000000000..851fbe7da --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda @@ -0,0 +1 @@ +x+)JMU03c040031QHIeH˒b(v;wT>G7]ݭ<ơ'=B \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc new file mode 100644 index 0000000000000000000000000000000000000000..c90ce22da828363198a85036c68a8f785587a8d1 GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8#q0&iOlFz{M1-z-jQmVcu(p&49^VQc!0qE(yt2&m zy#q!$^i35iYYZgb1{)HwCmJ|v5K579O;Vb0iM5(FZTjpGTjus9gh|A;!DG(Vxk4#( zktm^X#VjVh`fb@@oZvi8SAC~>edwty^968Vhh8EI91*QGd)=qH{>gtHg82aF**a0J C>P52v literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef new file mode 100644 index 0000000000000000000000000000000000000000..2a325619633b40fd9a3e09b91c27f0d8f228937d GIT binary patch literal 150 zcmV;H0BQet0gaDK3IZ_@L|x|;*$dM7bUJ}Sgjvlo(wPnl#uz~ng-gTO4NQ~*9A1?>O; literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 new file mode 100644 index 000000000..c6c240e0c --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 @@ -0,0 +1 @@ +x+)JMU03c040031QHIeʕ2ۃߴ?Tg>T>G7]ݭ<ơ'=G \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 new file mode 100644 index 0000000000000000000000000000000000000000..53eba54d8d322577f68d1582f54867550711c29e GIT binary patch literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@#q0%{Nisw`I3$(oY>}ioB$A53 zv&It3Vlj}(?|xr*m}VHK`KF)Twx?d|+O9ysJBpl$;Y@^Rj(SXW{geMZMDqnuEIP|3 C0!YUI literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e new file mode 100644 index 0000000000000000000000000000000000000000..268d0f4596bcf2600c8598a88037be18713815f1 GIT binary patch literal 18 Zcmbz~mVdgTN%FL;yYi1>gVx literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 new file mode 100644 index 0000000000000000000000000000000000000000..6d65f13b4ba310fca2adfb687ac6239597dddfa1 GIT binary patch literal 18 Zcmbz~l)NgFqisJODl81=s)p literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 new file mode 100644 index 0000000000000000000000000000000000000000..02dc6889120b0c2a240806b626b6a255b325ac62 GIT binary patch literal 18 Zcmbz~nI#gTM@?6aYQ{1?B(% literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad new file mode 100644 index 0000000000000000000000000000000000000000..0761b6105a0c6d0e83d26edd1b1dddb94e8d9fdc GIT binary patch literal 17 Ycmb5qjz~)@Fl(v86=t`S#!gybi-K^U~U* zdk{MG&CKVV2~hz-qg1$M$xt}VfQ5*PRV#E;NN&~5Ufrjd%qW(~2`R{6l~4jJWRa8y zR*qGfi_>?%FPk4He;%i+eYCAlJIzbGc%X>DNg(+nKnQN9`&73-^`F0Y+!wzjIjSXR BMz#O| literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed new file mode 100644 index 0000000000000000000000000000000000000000..13147f24bc09a0fcd1cc5fe3258c395be4f1966b GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWq6Yu=<&l~U9D33dJP`oi;~s7KsU%DQ literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d new file mode 100644 index 0000000000000000000000000000000000000000..8dab6a9eaf1fff6a519dfb7bec1a5bdb56ff845d GIT binary patch literal 17 Ycmb#IX_LF;gkVx4NPtTC17gkp>n z7tTX1u6UE){l4z7+~B<2uKG!Bd+JHnb^)55rQn%797h_>SjVZZf8swLtoZ_AyE_Ji Ca!0!W literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 new file mode 100644 index 000000000..efc598268 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 @@ -0,0 +1 @@ +x+)JMU03c040031QHIe2o]_G6ڱ-x/T>G7]ݭ<ơ'= 5 \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd new file mode 100644 index 0000000000000000000000000000000000000000..262f6ef1f2c9ad1980ac44ab73c1437b962c2c5c GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWpG{cyYzOO1H%Pz#slA%N~G-dU9}%7 ipIZr5@oes+*_$q2bN24mTvr}-V9OIG27!4@=>S3-256V=y!@Ff%bxNXyJgWsvJO^h^@*QM>x!DgULpI*ZlYJcXh1 ixs_lQ&*nawz3JjLXYX#!b>&ev4n64!o(KS(;T;4E&m*t^ literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c new file mode 100644 index 0000000000000000000000000000000000000000..b19f46c3de80eab61abe2182a0f572eb8de61379 GIT binary patch literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWw^G*Of=zIP|0^cp?C)A{{0Q@gu$f literal 0 HcmV?d00001 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 new file mode 100644 index 0000000000000000000000000000000000000000..711223894375fe1186ac5bfffdc48fb1fa1e65cc GIT binary patch literal 15 Wcmbz~liFgFp{c8~{DQ1G)M%Asl*{j2xB$XUF&6%)hC0~hmswxc_ zSj_y)xj23I`?A3}!DXCo_R+RJ?NpX_1!Ov73<(1q5xsZ2-KV file + git add . + git commit -m "commit $i" +done + +git checkout master + +git bisect start other~2 other~7 diff --git a/test/integration/bisectFromOtherBranch/test.json b/test/integration/bisectFromOtherBranch/test.json new file mode 100644 index 000000000..a5503ac83 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/test.json @@ -0,0 +1,4 @@ +{ + "description": "Opening lazygit when bisect has been started from another branch. There's an issue where we don't reselect the current branch if we mark the current branch as bad so this test side-steps that problem", + "speed": 20 +} diff --git a/test/integration/branchAutocomplete/setup.sh b/test/integration/branchAutocomplete/setup.sh index cde74f610..4c53f58a2 100644 --- a/test/integration/branchAutocomplete/setup.sh +++ b/test/integration/branchAutocomplete/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchDelete/setup.sh b/test/integration/branchDelete/setup.sh index da9b9bddb..d67fa9291 100644 --- a/test/integration/branchDelete/setup.sh +++ b/test/integration/branchDelete/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchRebase/setup.sh b/test/integration/branchRebase/setup.sh index 0fa1d98a1..a1f14b455 100644 --- a/test/integration/branchRebase/setup.sh +++ b/test/integration/branchRebase/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchReset/setup.sh b/test/integration/branchReset/setup.sh index 0fa1d98a1..a1f14b455 100644 --- a/test/integration/branchReset/setup.sh +++ b/test/integration/branchReset/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchSuggestions/setup.sh b/test/integration/branchSuggestions/setup.sh index da9b9bddb..d67fa9291 100644 --- a/test/integration/branchSuggestions/setup.sh +++ b/test/integration/branchSuggestions/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/cherryPicking/setup.sh b/test/integration/cherryPicking/setup.sh index d60a9a7e1..1a913412f 100644 --- a/test/integration/cherryPicking/setup.sh +++ b/test/integration/cherryPicking/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/commit/setup.sh b/test/integration/commit/setup.sh index 21fb3fefb..c6c6a9271 100644 --- a/test/integration/commit/setup.sh +++ b/test/integration/commit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/commitsNewBranch/setup.sh b/test/integration/commitsNewBranch/setup.sh index 9b9e01321..4e35cf543 100644 --- a/test/integration/commitsNewBranch/setup.sh +++ b/test/integration/commitsNewBranch/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/commitsRevert/setup.sh b/test/integration/commitsRevert/setup.sh index 9b9e01321..4e35cf543 100644 --- a/test/integration/commitsRevert/setup.sh +++ b/test/integration/commitsRevert/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/confirmQuit/setup.sh b/test/integration/confirmQuit/setup.sh index e58c74f38..ee8276237 100644 --- a/test/integration/confirmQuit/setup.sh +++ b/test/integration/confirmQuit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/customCommands/setup.sh b/test/integration/customCommands/setup.sh index 54ec0d96e..fbd02e952 100644 --- a/test/integration/customCommands/setup.sh +++ b/test/integration/customCommands/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/customCommandsComplex/setup.sh b/test/integration/customCommandsComplex/setup.sh index a37a2823b..0f364d18a 100644 --- a/test/integration/customCommandsComplex/setup.sh +++ b/test/integration/customCommandsComplex/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/diffing/setup.sh b/test/integration/diffing/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/diffing/setup.sh +++ b/test/integration/diffing/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/diffing2/setup.sh b/test/integration/diffing2/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/diffing2/setup.sh +++ b/test/integration/diffing2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/diffing3/setup.sh b/test/integration/diffing3/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/diffing3/setup.sh +++ b/test/integration/diffing3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/discardFileChanges/setup.sh b/test/integration/discardFileChanges/setup.sh index df68833f9..82fa59475 100644 --- a/test/integration/discardFileChanges/setup.sh +++ b/test/integration/discardFileChanges/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/discardOldFileChanges/setup.sh b/test/integration/discardOldFileChanges/setup.sh index 22426c2aa..5b592cabd 100644 --- a/test/integration/discardOldFileChanges/setup.sh +++ b/test/integration/discardOldFileChanges/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/filterPath/setup.sh b/test/integration/filterPath/setup.sh index e766b6bdb..460b35b25 100644 --- a/test/integration/filterPath/setup.sh +++ b/test/integration/filterPath/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/filterPath2/setup.sh b/test/integration/filterPath2/setup.sh index e766b6bdb..460b35b25 100644 --- a/test/integration/filterPath2/setup.sh +++ b/test/integration/filterPath2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/filterPath3/setup.sh b/test/integration/filterPath3/setup.sh index e766b6bdb..460b35b25 100644 --- a/test/integration/filterPath3/setup.sh +++ b/test/integration/filterPath3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/forcePush/setup.sh b/test/integration/forcePush/setup.sh index 79a9499d0..74192c316 100644 --- a/test/integration/forcePush/setup.sh +++ b/test/integration/forcePush/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/initialOpen/setup.sh b/test/integration/initialOpen/setup.sh index 84ad82d36..e7de1949f 100644 --- a/test/integration/initialOpen/setup.sh +++ b/test/integration/initialOpen/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflictRevert/setup.sh b/test/integration/mergeConflictRevert/setup.sh index 4618aa37c..aa3eb68c7 100644 --- a/test/integration/mergeConflictRevert/setup.sh +++ b/test/integration/mergeConflictRevert/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflictUndo/setup.sh b/test/integration/mergeConflictUndo/setup.sh index 0d9a57cf9..5182e5eae 100644 --- a/test/integration/mergeConflictUndo/setup.sh +++ b/test/integration/mergeConflictUndo/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflicts/setup.sh b/test/integration/mergeConflicts/setup.sh index 0d9a57cf9..5182e5eae 100644 --- a/test/integration/mergeConflicts/setup.sh +++ b/test/integration/mergeConflicts/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflictsResolvedExternally/setup.sh b/test/integration/mergeConflictsResolvedExternally/setup.sh index 1e6ecd751..e1126d2c3 100644 --- a/test/integration/mergeConflictsResolvedExternally/setup.sh +++ b/test/integration/mergeConflictsResolvedExternally/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/patchBuilding/setup.sh b/test/integration/patchBuilding/setup.sh index 2e117b4ad..3ba5d6017 100644 --- a/test/integration/patchBuilding/setup.sh +++ b/test/integration/patchBuilding/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/patchBuilding2/setup.sh b/test/integration/patchBuilding2/setup.sh index 2e117b4ad..3ba5d6017 100644 --- a/test/integration/patchBuilding2/setup.sh +++ b/test/integration/patchBuilding2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/patchBuildingWithFiletree/setup.sh b/test/integration/patchBuildingWithFiletree/setup.sh index 87dc9f6f6..c552b9e56 100644 --- a/test/integration/patchBuildingWithFiletree/setup.sh +++ b/test/integration/patchBuildingWithFiletree/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/pull/setup.sh b/test/integration/pull/setup.sh index 2634d0278..ffe8a3b6d 100644 --- a/test/integration/pull/setup.sh +++ b/test/integration/pull/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullAndSetUpstream/setup.sh b/test/integration/pullAndSetUpstream/setup.sh index cb1d07717..f0c7cf842 100644 --- a/test/integration/pullAndSetUpstream/setup.sh +++ b/test/integration/pullAndSetUpstream/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullMerge/setup.sh b/test/integration/pullMerge/setup.sh index b9d9a933a..379a95362 100644 --- a/test/integration/pullMerge/setup.sh +++ b/test/integration/pullMerge/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullMergeConflict/setup.sh b/test/integration/pullMergeConflict/setup.sh index a19999045..56967049f 100644 --- a/test/integration/pullMergeConflict/setup.sh +++ b/test/integration/pullMergeConflict/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebase/setup.sh b/test/integration/pullRebase/setup.sh index aef24c8e8..b1eb37fcf 100644 --- a/test/integration/pullRebase/setup.sh +++ b/test/integration/pullRebase/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebaseConflict/setup.sh b/test/integration/pullRebaseConflict/setup.sh index 63146bda2..e02be3c0c 100644 --- a/test/integration/pullRebaseConflict/setup.sh +++ b/test/integration/pullRebaseConflict/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebaseInteractive/setup.sh b/test/integration/pullRebaseInteractive/setup.sh index 0795a297f..a0dce709f 100644 --- a/test/integration/pullRebaseInteractive/setup.sh +++ b/test/integration/pullRebaseInteractive/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebaseInteractiveWithDrop/setup.sh b/test/integration/pullRebaseInteractiveWithDrop/setup.sh index 0795a297f..a0dce709f 100644 --- a/test/integration/pullRebaseInteractiveWithDrop/setup.sh +++ b/test/integration/pullRebaseInteractiveWithDrop/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/push/setup.sh b/test/integration/push/setup.sh index 7d137b349..075e9afd9 100644 --- a/test/integration/push/setup.sh +++ b/test/integration/push/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushAndSetUpstream/setup.sh b/test/integration/pushAndSetUpstream/setup.sh index 2911a073c..6c4c85af6 100644 --- a/test/integration/pushAndSetUpstream/setup.sh +++ b/test/integration/pushAndSetUpstream/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushAndSetUpstreamDefault/setup.sh b/test/integration/pushAndSetUpstreamDefault/setup.sh index d12f985f6..1d5f61ecf 100644 --- a/test/integration/pushAndSetUpstreamDefault/setup.sh +++ b/test/integration/pushAndSetUpstreamDefault/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushFollowTags/setup.sh b/test/integration/pushFollowTags/setup.sh index 2da0cbf18..035c9189d 100644 --- a/test/integration/pushFollowTags/setup.sh +++ b/test/integration/pushFollowTags/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushNoFollowTags/setup.sh b/test/integration/pushNoFollowTags/setup.sh index 304dcd9e9..b60c4eed4 100644 --- a/test/integration/pushNoFollowTags/setup.sh +++ b/test/integration/pushNoFollowTags/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushTag/setup.sh b/test/integration/pushTag/setup.sh index 5e09ed4ea..cf6270c03 100644 --- a/test/integration/pushTag/setup.sh +++ b/test/integration/pushTag/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushWithCredentials/setup.sh b/test/integration/pushWithCredentials/setup.sh index 97de49d11..d39a13d5a 100644 --- a/test/integration/pushWithCredentials/setup.sh +++ b/test/integration/pushWithCredentials/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/rebase/setup.sh b/test/integration/rebase/setup.sh index d11e86c0a..8806332fd 100644 --- a/test/integration/rebase/setup.sh +++ b/test/integration/rebase/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebase2/setup.sh b/test/integration/rebase2/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebase2/setup.sh +++ b/test/integration/rebase2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebase3/setup.sh b/test/integration/rebase3/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebase3/setup.sh +++ b/test/integration/rebase3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseFixupAndSquash/setup.sh b/test/integration/rebaseFixupAndSquash/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebaseFixupAndSquash/setup.sh +++ b/test/integration/rebaseFixupAndSquash/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseFixups/setup.sh b/test/integration/rebaseFixups/setup.sh index 84c2fab8d..99fec6578 100644 --- a/test/integration/rebaseFixups/setup.sh +++ b/test/integration/rebaseFixups/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseRewordLastCommit/setup.sh b/test/integration/rebaseRewordLastCommit/setup.sh index 42957e626..cdd7ac5d0 100644 --- a/test/integration/rebaseRewordLastCommit/setup.sh +++ b/test/integration/rebaseRewordLastCommit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseRewordOldCommit/setup.sh b/test/integration/rebaseRewordOldCommit/setup.sh index 42957e626..cdd7ac5d0 100644 --- a/test/integration/rebaseRewordOldCommit/setup.sh +++ b/test/integration/rebaseRewordOldCommit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseSwapping/setup.sh b/test/integration/rebaseSwapping/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebaseSwapping/setup.sh +++ b/test/integration/rebaseSwapping/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogCheckout/setup.sh b/test/integration/reflogCheckout/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogCheckout/setup.sh +++ b/test/integration/reflogCheckout/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogCherryPick/setup.sh b/test/integration/reflogCherryPick/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogCherryPick/setup.sh +++ b/test/integration/reflogCherryPick/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogCommitFiles/setup.sh b/test/integration/reflogCommitFiles/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogCommitFiles/setup.sh +++ b/test/integration/reflogCommitFiles/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogHardReset/setup.sh b/test/integration/reflogHardReset/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogHardReset/setup.sh +++ b/test/integration/reflogHardReset/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rememberCommitMessageAfterFail/setup.sh b/test/integration/rememberCommitMessageAfterFail/setup.sh index d4c351f63..0ac33d4c9 100644 --- a/test/integration/rememberCommitMessageAfterFail/setup.sh +++ b/test/integration/rememberCommitMessageAfterFail/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/searching/setup.sh b/test/integration/searching/setup.sh index 21fb3fefb..c6c6a9271 100644 --- a/test/integration/searching/setup.sh +++ b/test/integration/searching/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/searchingInStagingPanel/setup.sh b/test/integration/searchingInStagingPanel/setup.sh index d55861929..e3566ddb9 100644 --- a/test/integration/searchingInStagingPanel/setup.sh +++ b/test/integration/searchingInStagingPanel/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/setUpstream/setup.sh b/test/integration/setUpstream/setup.sh index 6a2b91419..a5a68834a 100644 --- a/test/integration/setUpstream/setup.sh +++ b/test/integration/setUpstream/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/squash/setup.sh b/test/integration/squash/setup.sh index 15e61f48b..44b82bf26 100644 --- a/test/integration/squash/setup.sh +++ b/test/integration/squash/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/staginWithDiffContextChange/setup.sh b/test/integration/staginWithDiffContextChange/setup.sh index 7cfacd06f..ac450f8d2 100644 --- a/test/integration/staginWithDiffContextChange/setup.sh +++ b/test/integration/staginWithDiffContextChange/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stagingTwo/setup.sh b/test/integration/stagingTwo/setup.sh index 7cfacd06f..ac450f8d2 100644 --- a/test/integration/stagingTwo/setup.sh +++ b/test/integration/stagingTwo/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stash/setup.sh b/test/integration/stash/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stash/setup.sh +++ b/test/integration/stash/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stashDrop/setup.sh b/test/integration/stashDrop/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stashDrop/setup.sh +++ b/test/integration/stashDrop/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stashNewBranch/setup.sh b/test/integration/stashNewBranch/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stashNewBranch/setup.sh +++ b/test/integration/stashNewBranch/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stashPop/setup.sh b/test/integration/stashPop/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stashPop/setup.sh +++ b/test/integration/stashPop/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stash_Copy/setup.sh b/test/integration/stash_Copy/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stash_Copy/setup.sh +++ b/test/integration/stash_Copy/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/switchTabFromMenu/setup.sh b/test/integration/switchTabFromMenu/setup.sh index 65cd6d129..e6f5ec24f 100644 --- a/test/integration/switchTabFromMenu/setup.sh +++ b/test/integration/switchTabFromMenu/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags/setup.sh b/test/integration/tags/setup.sh index 75cd7a91b..e878a9ed5 100644 --- a/test/integration/tags/setup.sh +++ b/test/integration/tags/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags2/setup.sh b/test/integration/tags2/setup.sh index d11e86c0a..8806332fd 100644 --- a/test/integration/tags2/setup.sh +++ b/test/integration/tags2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags3/setup.sh b/test/integration/tags3/setup.sh index d11e86c0a..8806332fd 100644 --- a/test/integration/tags3/setup.sh +++ b/test/integration/tags3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags4/setup.sh b/test/integration/tags4/setup.sh index 75cd7a91b..e878a9ed5 100644 --- a/test/integration/tags4/setup.sh +++ b/test/integration/tags4/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/undo/setup.sh b/test/integration/undo/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/undo/setup.sh +++ b/test/integration/undo/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/undo2/setup.sh b/test/integration/undo2/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/undo2/setup.sh +++ b/test/integration/undo2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init